add tests

lecousin · lecousin · commit 3874c2ec03f8 · 2020-02-26T06:04:13.000+01:00
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/tasks/drives/SeekFile.java b/net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/tasks/drives/SeekFile.java
@@ -68,13 +68,12 @@ public Long execute() throws IOException, CancelException {
 				if (!allowAfterEnd && pos + move > size) move = size - pos;
 				file.channel.position(pos + move);
 				break;
-			case FROM_END:
+			default: //case FROM_END:
 				if (move < 0) move = 0;
 				if (size == -1) size = file.getSize();
 				if (size - move < 0) move = size;
 				file.channel.position(size - move);
 				break;
-			default: break;
 			}
 			if (returnNewPosition)
 				return Long.valueOf(file.channel.position());
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/FragmentedSubIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/FragmentedSubIO.java
@@ -311,10 +311,9 @@ public long seekSync(SeekType type, long move) {
 		case FROM_END:
 			pos = size - move;
 			break;
-		case FROM_CURRENT:
+		default: //case FROM_CURRENT:
 			pos += move;
 			break;
-		default: break;
 		}
 		if (pos > size) pos = size;
 		if (pos < 0) pos = 0;
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/LinkedIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/LinkedIO.java
@@ -922,7 +922,7 @@ protected long seekSync(SeekType type, long move) throws IOException {
 			move += pos;
 			break;
 		case FROM_BEGINNING: break;
-		case FROM_END:
+		default: //case FROM_END:
 			long p = 0;
 			for (int i = 0; i < ios.size(); ++i) {
 				if (sizes.get(i) == null) {
@@ -933,7 +933,6 @@ protected long seekSync(SeekType type, long move) throws IOException {
 			}
 			move = p - move;
 			break;
-		default: break;
 		}
 		if (move < 0) move = 0;
 		pos = 0;
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/SubIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/SubIO.java
@@ -731,7 +731,6 @@ protected AsyncSupplier<Integer,IOException> readFullyAsync(
 	
 	protected long seekSync(SeekType type, long move) {
 		switch (type) {
-		default:
 		case FROM_BEGINNING:
 			if (move < 0) move = 0;
 			if (move > size) move = size;
@@ -742,7 +741,7 @@ protected long seekSync(SeekType type, long move) {
 			if (size - move < 0) move = size;
 			pos = size - move;
 			return pos;
-		case FROM_CURRENT:
+		default: //case FROM_CURRENT:
 			if (pos + move < 0) move = -pos;
 			if (pos + move > size) move = size - pos;
 			pos += move;
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/BufferedIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/BufferedIO.java
@@ -1366,11 +1366,9 @@ public long seekSync(SeekType type, long move) {
 		case FROM_END:
 			position = size - move;
 			break;
-		case FROM_CURRENT:
+		default: //case FROM_CURRENT:
 			position += move;
 			break;
-		default:
-			break;
 		}
 		if (position > size) position = size;
 		if (position < 0) position = 0;
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ByteArrayIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ByteArrayIO.java
@@ -306,12 +306,11 @@ public long seekSync(SeekType type, long move) {
 			if (move > size) pos = 0;
 			else pos = (int)(size - move);
 			break;
-		case FROM_CURRENT:
+		default: //case FROM_CURRENT:
 			pos += (int)move;
 			if (pos < 0) pos = 0;
 			else if (pos > size) pos = size;
 			break;
-		default: break;
 		}
 		return pos;
 	}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ByteBuffersIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ByteBuffersIO.java
@@ -312,10 +312,9 @@ public long seekSync(SeekType type, long move) {
 		case FROM_CURRENT:
 			skipSync(move);
 			break;
-		case FROM_END:
+		default: //case FROM_END:
 			skipSync(totalSize - move - pos);
 			break;
-		default: break;
 		}
 		return pos;
 	}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/IOInMemoryOrFile.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/IOInMemoryOrFile.java
@@ -128,10 +128,9 @@ public long seekSync(SeekType type, long move) {
 		case FROM_CURRENT:
 			this.pos += move;
 			break;
-		case FROM_END:
+		default: //case FROM_END:
 			this.pos = size - move;
 			break;
-		default: break;
 		}
 		if (this.pos < 0) this.pos = 0;
 		if (this.pos > size) this.pos = this.size;
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/MemoryIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/MemoryIO.java
@@ -241,7 +241,7 @@ public long seekSync(SeekType type, long move) {
 			else if (move > size) pos = 0;
 			else pos = size - (int)move;
 			break;
-		case FROM_CURRENT: 
+		default: //case FROM_CURRENT: 
 			if (move < 0) {
 				if (pos + move < 0) pos = 0;
 				else pos += (int)move;
@@ -250,7 +250,6 @@ public long seekSync(SeekType type, long move) {
 				else pos += (int)move;
 			}
 			break;
-		default: break;
 		}
 		return pos;
 	}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ReadableToSeekable.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ReadableToSeekable.java
@@ -486,7 +486,8 @@ public long seekSync(SeekType type, long move) throws IOException {
 				pos = newPos;
 			break;
 		}
-		case FROM_END: {
+		default: //case FROM_END: 
+		{
 			if (move < 0) move = 0;
 			if (knownSize < 0) getSizeSync();
 			long newPos = knownSize - move;
@@ -499,7 +500,6 @@ public long seekSync(SeekType type, long move) throws IOException {
 				pos = newPos;
 			break;
 		}
-		default: break;
 		}
 		return pos;
 	}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/TwoBuffersIO.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/TwoBuffersIO.java
@@ -680,11 +680,10 @@ public long seekSync(SeekType type, long move) throws IOException {
 			pos = 0;
 			skipSync(move);
 			return pos;
-		case FROM_END:
+		default: //case FROM_END:
 			pos = (int)getSizeSync();
 			skipSync(-move);
 			return pos;
-		default: return 0;
 		}
 	}
 
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/out2in/OutputToInput.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/out2in/OutputToInput.java
@@ -312,7 +312,7 @@ public long seekSync(SeekType type, long move) throws IOException {
 		case FROM_CURRENT:
 			skipSync(move);
 			return readPos;
-		case FROM_END:
+		default: //case FROM_END:
 			while (!eof && !lock.hasError()) {
 				lock.lock();
 			}
@@ -322,8 +322,6 @@ public long seekSync(SeekType type, long move) throws IOException {
 				return readPos;
 			}
 			throw new OutputToInputTransferException(lock.getError());
-		default:
-			throw new IOException("Unknown SeekType " + type);
 		}
 	}
 
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/serialization/AbstractDeserializer.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/serialization/AbstractDeserializer.java
@@ -83,7 +83,11 @@ protected List<SerializationRule> addRulesForAttribute(Attribute a, List<Seriali
 	public <T> AsyncSupplier<T, SerializationException> deserializeValue(
 		SerializationContext context, TypeDefinition type, String path, List<SerializationRule> rules
 	) {
-		rules = addRulesForType(new SerializationClass(type), rules);
+		try {
+			rules = addRulesForType(new SerializationClass(type), rules);
+		} catch (SerializationException e) {
+			return new AsyncSupplier<>(null, e);
+		}
 		TypeDefinition newType = type;
 		List<TypeDefinition> rulesTypes = new ArrayList<>(rules.size());
 		for (SerializationRule rule : rules) {
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/serialization/SerializationClass.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/serialization/SerializationClass.java
@@ -25,7 +25,7 @@
 public class SerializationClass {
 	
 	/** Constructor. */
-	public SerializationClass(TypeDefinition type) {
+	public SerializationClass(TypeDefinition type) throws SerializationException {
 		this.type = type;
 		populateAttributes();
 	}
@@ -260,13 +260,13 @@ public List<Annotation> getAnnotations(boolean onGet) {
 		}
 	}
 	
-	private void populateAttributes() {
+	private void populateAttributes() throws SerializationException {
 		populateAttributes(type.getBase(), type.getParameters());
 		filterAttributes();
 	}
 	
 	@SuppressWarnings("rawtypes")
-	private void populateAttributes(Class<?> type, List<TypeDefinition> params) {
+	private void populateAttributes(Class<?> type, List<TypeDefinition> params) throws SerializationException {
 		if (Object.class.equals(type))
 			return;
 		for (Field f : type.getDeclaredFields()) {
@@ -282,6 +282,9 @@ private void populateAttributes(Class<?> type, List<TypeDefinition> params) {
 				for (Type arg : ((ParameterizedType)t).getActualTypeArguments()) {
 					if (arg instanceof TypeVariable) {
 						TypeVariable[] typeArgs = type.getTypeParameters();
+						if (typeArgs.length != params.size())
+							throw new SerializationException("Invalid number of parameter specification for type "
+								+ type + ": " + params.size() + " found, expected is " + typeArgs.length);
 						for (int i = 0; i < typeArgs.length; ++i)
 							if (typeArgs[i].getName().equals(((TypeVariable)arg).getName())) {
 								superParams.add(params.get(i));
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/xml/serialization/XMLDeserializer.java b/net.lecousin.core/src/main/java/net/lecousin/framework/xml/serialization/XMLDeserializer.java
@@ -211,8 +211,8 @@ protected AsyncSupplier<? extends CharSequence, SerializationException> deserial
 		if (input.event.isClosed)
 			return new AsyncSupplier<>(null, null);
 		
-		AsyncSupplier<String, SerializationException> result = new AsyncSupplier<>();
-		StringBuilder s = new StringBuilder();
+		AsyncSupplier<CharArrayStringBuffer, SerializationException> result = new AsyncSupplier<>();
+		CharArrayStringBuffer s = new CharArrayStringBuffer();
 		Runnable onNext = new Runnable() {
 			@Override
 			public void run() {
@@ -226,7 +226,7 @@ public void run() {
 					return;
 				}
 				if (XMLStreamEvents.Event.Type.END_ELEMENT.equals(input.event.type)) {
-					result.unblockSuccess(s.toString());
+					result.unblockSuccess(s);
 					return;
 				}
 				input.next().onDone(this, result, xmlErrorConverter);
diff --git a/net.lecousin.core/src/test/java/net/lecousin/framework/core/test/serialization/TestSerialization.java b/net.lecousin.core/src/test/java/net/lecousin/framework/core/test/serialization/TestSerialization.java
diff --git a/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestByteArrayIOReadable.java b/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestByteArrayIOReadable.java
diff --git a/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/text/TestFullReadLines.java b/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/text/TestFullReadLines.java

Original file line number	Diff line number	Diff line change
`@@ -306,12 +306,11 @@ public long seekSync(SeekType type, long move) {`
`306`	`306`	`if (move > size) pos = 0;`
`307`	`307`	`else pos = (int)(size - move);`
`308`	`308`	`break;`
`309`		`- case FROM_CURRENT:`
	`309`	`+ default: //case FROM_CURRENT:`
`310`	`310`	`pos += (int)move;`
`311`	`311`	`if (pos < 0) pos = 0;`
`312`	`312`	`else if (pos > size) pos = size;`
`313`	`313`	`break;`
`314`		`- default: break;`
`315`	`314`	`}`
`316`	`315`	`return pos;`
`317`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -312,10 +312,9 @@ public long seekSync(SeekType type, long move) {`
`312`	`312`	`case FROM_CURRENT:`
`313`	`313`	`skipSync(move);`
`314`	`314`	`break;`
`315`		`- case FROM_END:`
	`315`	`+ default: //case FROM_END:`
`316`	`316`	`skipSync(totalSize - move - pos);`
`317`	`317`	`break;`
`318`		`- default: break;`
`319`	`318`	`}`
`320`	`319`	`return pos;`
`321`	`320`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ public long seekSync(SeekType type, long move) {`
`241`	`241`	`else if (move > size) pos = 0;`
`242`	`242`	`else pos = size - (int)move;`
`243`	`243`	`break;`
`244`		`- case FROM_CURRENT:`
	`244`	`+ default: //case FROM_CURRENT:`
`245`	`245`	`if (move < 0) {`
`246`	`246`	`if (pos + move < 0) pos = 0;`
`247`	`247`	`else pos += (int)move;`
`@@ -250,7 +250,6 @@ public long seekSync(SeekType type, long move) {`
`250`	`250`	`else pos += (int)move;`
`251`	`251`	`}`
`252`	`252`	`break;`
`253`		`- default: break;`
`254`	`253`	`}`
`255`	`254`	`return pos;`
`256`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,8 @@ public long seekSync(SeekType type, long move) throws IOException {`
`486`	`486`	`pos = newPos;`
`487`	`487`	`break;`
`488`	`488`	`}`
`489`		`- case FROM_END: {`
	`489`	`+ default: //case FROM_END:`
	`490`	`+ {`
`490`	`491`	`if (move < 0) move = 0;`
`491`	`492`	`if (knownSize < 0) getSizeSync();`
`492`	`493`	`long newPos = knownSize - move;`
`@@ -499,7 +500,6 @@ public long seekSync(SeekType type, long move) throws IOException {`
`499`	`500`	`pos = newPos;`
`500`	`501`	`break;`
`501`	`502`	`}`
`502`		`- default: break;`
`503`	`503`	`}`
`504`	`504`	`return pos;`
`505`	`505`	`}`