X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Ftestcases%2Forg%2Fsimantics%2Fdataboard%2Ftests%2FTestBinding.java;h=d4f5d22ceaa8b8c2c282dea28d31d4cc28214a4e;hb=ff1337ff96700fb157ec789cbef88b8f40e03798;hp=2878de44d059e061b702ed06b75b681fc880305c;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestBinding.java b/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestBinding.java index 2878de44d..d4f5d22ce 100644 --- a/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestBinding.java +++ b/bundles/org.simantics.databoard/testcases/org/simantics/databoard/tests/TestBinding.java @@ -1,41 +1,41 @@ -/******************************************************************************* - * Copyright (c) 2010 Association for Decentralized Information Management in - * Industry THTH ry. - * 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 - *******************************************************************************/ +/******************************************************************************* + * Copyright (c) 2010 Association for Decentralized Information Management in + * Industry THTH ry. + * 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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; - -import org.junit.Test; -import org.simantics.databoard.Bindings; -import org.simantics.databoard.binding.Binding; -import org.simantics.databoard.binding.IntegerBinding; -import org.simantics.databoard.binding.MapBinding; -import org.simantics.databoard.binding.error.BindingException; -import org.simantics.databoard.binding.util.RandomValue; -import org.simantics.databoard.parser.repository.DataTypeSyntaxError; -import org.simantics.databoard.serialization.SerializationException; -import org.simantics.databoard.serialization.Serializer; -import org.simantics.databoard.serialization.SerializerConstructionException; -import org.simantics.databoard.type.Datatype; -import org.simantics.databoard.type.IntegerType; -import org.simantics.databoard.type.StringType; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; + +import org.junit.Test; +import org.simantics.databoard.Bindings; +import org.simantics.databoard.binding.Binding; +import org.simantics.databoard.binding.IntegerBinding; +import org.simantics.databoard.binding.MapBinding; +import org.simantics.databoard.binding.error.BindingException; +import org.simantics.databoard.binding.util.RandomValue; +import org.simantics.databoard.parser.repository.DataTypeSyntaxError; +import org.simantics.databoard.serialization.SerializationException; +import org.simantics.databoard.serialization.Serializer; +import org.simantics.databoard.serialization.SerializerConstructionException; +import org.simantics.databoard.type.Datatype; +import org.simantics.databoard.type.IntegerType; +import org.simantics.databoard.type.StringType; /** * This Test Case tests @@ -615,8 +615,8 @@ public class TestBinding extends TestData { assertFalse( b1.equals(o1, o1_) ); assertFalse( b2.equals(o2, o2_) ); b1.assertInstaceIsValid(o1_); - b2.assertInstaceIsValid(o2_); - + b2.assertInstaceIsValid(o2_); + // Ascii Serializer Test @@ -674,20 +674,20 @@ public class TestBinding extends TestData { Object o_ = s.deserialize( bytes ); assertEquals(0, b.compare(o, o_)); - assertTrue( b.equals(o, o_) ); - - // deserialize to instance Test - Binding gb = Bindings.getMutableBinding( b.type() ); - o_ = gb.createDefault(); - s = gb.serializer(); - s.deserialize(bytes, o_); - assertTrue(Bindings.equals(b, o, gb, o_)); - - // Read from test - o_ = gb.createDefault(); - gb.readFrom(b, o, o_); - assertTrue(Bindings.equals(b, o, gb, o_)); - + assertTrue( b.equals(o, o_) ); + + // deserialize to instance Test + Binding gb = Bindings.getMutableBinding( b.type() ); + o_ = gb.createDefault(); + s = gb.serializer(); + s.deserialize(bytes, o_); + assertTrue(Bindings.equals(b, o, gb, o_)); + + // Read from test + o_ = gb.createDefault(); + gb.readFrom(b, o, o_); + assertTrue(Bindings.equals(b, o, gb, o_)); + // Ascii Serializer Test if (!OMIT_PARSER_TEST) {