X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Ftestcases%2Forg%2Fsimantics%2Fdataboard%2Ftests%2FTestPartialMap.java;h=b5b45ab39cb619c407462d18b96bd634e76ba639;hp=7cc4261550215aebc8285fa2e29f8ca3e3f04040;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

diff --git a/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestPartialMap.java b/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestPartialMap.java
index 7cc426155..b5b45ab39 100644
--- a/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestPartialMap.java
+++ b/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestPartialMap.java
@@ -1,104 +1,104 @@
-/*******************************************************************************
- * Copyright (c) 2007 VTT Technical Research Centre of Finland and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.databoard.tests;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.simantics.databoard.Accessors;
-import org.simantics.databoard.Bindings;
-import org.simantics.databoard.accessor.MapAccessor;
-import org.simantics.databoard.accessor.impl.AccessorParams;
-import org.simantics.databoard.accessor.java.JavaObject;
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.serialization.Serializer;
-import org.simantics.databoard.type.Datatype;
-import org.simantics.databoard.type.IntegerType;
-import org.simantics.databoard.type.MapType;
-import org.simantics.databoard.type.StringType;
-import org.simantics.databoard.util.binary.BinaryMemory;
-import org.simantics.databoard.util.binary.RandomAccessBinary;
-
-public class TestPartialMap {
-
-	public @Test void testBinary() throws Exception {
-		
-		Datatype variableSizedType = new MapType( new IntegerType(), new StringType() );
-		Datatype constantSizedType = new MapType( new IntegerType(), new IntegerType() );
-		
-		testVar( buildMemory(variableSizedType) );
-		testCons( buildMemory(constantSizedType) );
-		
-		testVar( buildJava(variableSizedType) );
-		testCons( buildJava(constantSizedType) );
-		
-	}
-
-	MapAccessor buildMemory(Datatype type) throws Exception {
-		RandomAccessBinary m = new BinaryMemory( 0 );
-		Binding binding = Bindings.getMutableBinding(type);
-		Serializer s = Bindings.getSerializer(binding);
-		Object instance = binding.createDefault();
-		byte[] data = s.serialize(instance);
-		m.write(data);
-		m.position(0L);
-		m.setLength(data.length);
-		return Accessors.getAccessor( m, type);
-	}
-	
-	MapAccessor buildJava(Datatype type) throws Exception {
-		Binding binding = Bindings.getMutableBinding(type);
-		Object instance = binding.createDefault();
-		return (MapAccessor) JavaObject.createAccessor(null, binding, instance, AccessorParams.DEFAULT);
-	}	
-	
-	void testVar(MapAccessor ma) throws Exception {
-		Assert.assertEquals(0, ma.size());
-		ma.put( Bindings.INTEGER, 0, Bindings.STRING, "0");
-		Assert.assertEquals(1, ma.size());
-		ma.put( Bindings.INTEGER, 2, Bindings.STRING, "2");
-		Assert.assertEquals(2, ma.size());
-		ma.put( Bindings.INTEGER, 4, Bindings.STRING, "4");
-		Assert.assertEquals(3, ma.size());
-		
-		Assert.assertEquals( 0, ma.count(Bindings.INTEGER, 2, false, 2, false));
-		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 1, true, 3, true));
-		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 2, true, 2, true));
-		
-		Assert.assertEquals( 3, ma.count(Bindings.INTEGER, 0, true, 4, true));
-		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 0, false, 4, false));
-		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, true, 4, false));
-		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, false, 4, true));		
-	}
-	
-	void testCons(MapAccessor ma) throws Exception {
-		Assert.assertEquals(0, ma.size());
-		ma.put( Bindings.INTEGER, 0, Bindings.INTEGER, 0);
-		Assert.assertEquals(1, ma.size());
-		ma.put( Bindings.INTEGER, 2, Bindings.INTEGER, 2);
-		Assert.assertEquals(2, ma.size());
-		ma.put( Bindings.INTEGER, 4, Bindings.INTEGER, 4);
-		Assert.assertEquals(3, ma.size());
-				
-		Assert.assertEquals( 3, ma.count(Bindings.INTEGER, 0, true, 4, true));
-		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 0, false, 4, false));
-		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, true, 4, false));
-		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, false, 4, true));
-		
-		Assert.assertEquals( 0, ma.count(Bindings.INTEGER, 2, false, 2, false));
-		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 1, true, 3, true));
-		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 2, true, 2, true));
-		
-	}
-	
-	
-}
-
+/*******************************************************************************
+ * Copyright (c) 2007 VTT Technical Research Centre of Finland and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.databoard.tests;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+import org.simantics.databoard.Accessors;
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.accessor.MapAccessor;
+import org.simantics.databoard.accessor.impl.AccessorParams;
+import org.simantics.databoard.accessor.java.JavaObject;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.serialization.Serializer;
+import org.simantics.databoard.type.Datatype;
+import org.simantics.databoard.type.IntegerType;
+import org.simantics.databoard.type.MapType;
+import org.simantics.databoard.type.StringType;
+import org.simantics.databoard.util.binary.BinaryMemory;
+import org.simantics.databoard.util.binary.RandomAccessBinary;
+
+public class TestPartialMap {
+
+	public @Test void testBinary() throws Exception {
+		
+		Datatype variableSizedType = new MapType( new IntegerType(), new StringType() );
+		Datatype constantSizedType = new MapType( new IntegerType(), new IntegerType() );
+		
+		testVar( buildMemory(variableSizedType) );
+		testCons( buildMemory(constantSizedType) );
+		
+		testVar( buildJava(variableSizedType) );
+		testCons( buildJava(constantSizedType) );
+		
+	}
+
+	MapAccessor buildMemory(Datatype type) throws Exception {
+		RandomAccessBinary m = new BinaryMemory( 0 );
+		Binding binding = Bindings.getMutableBinding(type);
+		Serializer s = Bindings.getSerializer(binding);
+		Object instance = binding.createDefault();
+		byte[] data = s.serialize(instance);
+		m.write(data);
+		m.position(0L);
+		m.setLength(data.length);
+		return Accessors.getAccessor( m, type);
+	}
+	
+	MapAccessor buildJava(Datatype type) throws Exception {
+		Binding binding = Bindings.getMutableBinding(type);
+		Object instance = binding.createDefault();
+		return (MapAccessor) JavaObject.createAccessor(null, binding, instance, AccessorParams.DEFAULT);
+	}	
+	
+	void testVar(MapAccessor ma) throws Exception {
+		Assert.assertEquals(0, ma.size());
+		ma.put( Bindings.INTEGER, 0, Bindings.STRING, "0");
+		Assert.assertEquals(1, ma.size());
+		ma.put( Bindings.INTEGER, 2, Bindings.STRING, "2");
+		Assert.assertEquals(2, ma.size());
+		ma.put( Bindings.INTEGER, 4, Bindings.STRING, "4");
+		Assert.assertEquals(3, ma.size());
+		
+		Assert.assertEquals( 0, ma.count(Bindings.INTEGER, 2, false, 2, false));
+		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 1, true, 3, true));
+		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 2, true, 2, true));
+		
+		Assert.assertEquals( 3, ma.count(Bindings.INTEGER, 0, true, 4, true));
+		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 0, false, 4, false));
+		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, true, 4, false));
+		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, false, 4, true));		
+	}
+	
+	void testCons(MapAccessor ma) throws Exception {
+		Assert.assertEquals(0, ma.size());
+		ma.put( Bindings.INTEGER, 0, Bindings.INTEGER, 0);
+		Assert.assertEquals(1, ma.size());
+		ma.put( Bindings.INTEGER, 2, Bindings.INTEGER, 2);
+		Assert.assertEquals(2, ma.size());
+		ma.put( Bindings.INTEGER, 4, Bindings.INTEGER, 4);
+		Assert.assertEquals(3, ma.size());
+				
+		Assert.assertEquals( 3, ma.count(Bindings.INTEGER, 0, true, 4, true));
+		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 0, false, 4, false));
+		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, true, 4, false));
+		Assert.assertEquals( 2, ma.count(Bindings.INTEGER, 0, false, 4, true));
+		
+		Assert.assertEquals( 0, ma.count(Bindings.INTEGER, 2, false, 2, false));
+		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 1, true, 3, true));
+		Assert.assertEquals( 1, ma.count(Bindings.INTEGER, 2, true, 2, true));
+		
+	}
+	
+	
+}
+