[infinispan-commits] Infinispan SVN: r603 - in trunk/core/src/test/java/org/infinispan: statetransfer and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Jul 22 06:31:37 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-07-22 06:31:37 -0400 (Wed, 22 Jul 2009)
New Revision: 603
Added:
trunk/core/src/test/java/org/infinispan/test/data/Address.java
trunk/core/src/test/java/org/infinispan/test/data/Person.java
Removed:
trunk/core/src/test/java/org/infinispan/statetransfer/Address.java
trunk/core/src/test/java/org/infinispan/statetransfer/Person.java
Modified:
trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java
trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
Log:
Reenabled state transfer tests
Modified: trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java 2009-07-21 16:39:44 UTC (rev 602)
+++ trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -59,7 +59,7 @@
import org.infinispan.remoting.responses.UnsuccessfulResponse;
import org.infinispan.remoting.transport.Address;
import org.infinispan.remoting.transport.jgroups.JGroupsAddress;
-import org.infinispan.statetransfer.Person;
+import org.infinispan.test.data.Person;
import org.infinispan.transaction.TransactionLog;
import org.infinispan.transaction.xa.GlobalTransaction;
import org.infinispan.transaction.xa.GlobalTransactionFactory;
@@ -88,7 +88,7 @@
@Test(groups = "functional", testName = "marshall.jboss.JBossMarshallerTest")
public class JBossMarshallerTest {
-// private final JBossMarshaller marshaller = new JBossMarshaller();
+ // private final JBossMarshaller marshaller = new JBossMarshaller();
private final VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
private GlobalTransactionFactory gtf = new GlobalTransactionFactory();
@@ -168,16 +168,16 @@
Person p = new Person();
p.setName("Bob Dylan");
MarshalledValue mv = new MarshalledValue(p, true, marshaller);
- marshallAndAssertEquality(mv);
+ marshallAndAssertEquality(mv);
}
-
+
public void testMarshalledValueGetMarshalling() throws Exception {
Pojo ext = new Pojo();
MarshalledValue mv = new MarshalledValue(ext, true, marshaller);
byte[] bytes = marshaller.objectToByteBuffer(mv);
MarshalledValue rmv = (MarshalledValue) marshaller.objectFromByteBuffer(bytes);
assert rmv.equals(mv) : "Writen[" + mv + "] and read[" + rmv + "] objects should be the same";
- assert rmv.get() instanceof Pojo;
+ assert rmv.get() instanceof Pojo;
}
public void testSingletonListMarshalling() throws Exception {
@@ -297,7 +297,7 @@
TransientMortalCacheEntry entry4 = (TransientMortalCacheEntry) InternalEntryFactory.create("key", "value", System.currentTimeMillis() - 1000, 200000, System.currentTimeMillis(), 4000000);
marshallAndAssertEquality(entry4);
}
-
+
public void testInternalCacheValueMarshalling() throws Exception {
ImmortalCacheValue value1 = (ImmortalCacheValue) InternalEntryFactory.createValue("value", System.currentTimeMillis() - 1000, -1, System.currentTimeMillis(), -1);
byte[] bytes = marshaller.objectToByteBuffer(value1);
@@ -308,18 +308,18 @@
bytes = marshaller.objectToByteBuffer(value2);
MortalCacheValue rvalue2 = (MortalCacheValue) marshaller.objectFromByteBuffer(bytes);
assert rvalue2.getValue().equals(value2.getValue()) : "Writen[" + rvalue2.getValue() + "] and read[" + value2.getValue() + "] objects should be the same";
-
+
TransientCacheValue value3 = (TransientCacheValue) InternalEntryFactory.createValue("value", System.currentTimeMillis() - 1000, -1, System.currentTimeMillis(), 4000000);
bytes = marshaller.objectToByteBuffer(value3);
TransientCacheValue rvalue3 = (TransientCacheValue) marshaller.objectFromByteBuffer(bytes);
assert rvalue3.getValue().equals(value3.getValue()) : "Writen[" + rvalue3.getValue() + "] and read[" + value3.getValue() + "] objects should be the same";
-
+
TransientMortalCacheValue value4 = (TransientMortalCacheValue) InternalEntryFactory.createValue("value", System.currentTimeMillis() - 1000, 200000, System.currentTimeMillis(), 4000000);
bytes = marshaller.objectToByteBuffer(value4);
TransientMortalCacheValue rvalue4 = (TransientMortalCacheValue) marshaller.objectFromByteBuffer(bytes);
assert rvalue4.getValue().equals(value4.getValue()) : "Writen[" + rvalue4.getValue() + "] and read[" + value4.getValue() + "] objects should be the same";
}
-
+
public void testBucketMarshalling() throws Exception {
ImmortalCacheEntry entry1 = (ImmortalCacheEntry) InternalEntryFactory.create("key", "value", System.currentTimeMillis() - 1000, -1, System.currentTimeMillis(), -1);
MortalCacheEntry entry2 = (MortalCacheEntry) InternalEntryFactory.create("key", "value", System.currentTimeMillis() - 1000, 200000, System.currentTimeMillis(), -1);
@@ -331,24 +331,24 @@
b.addEntry(entry2);
b.addEntry(entry3);
b.addEntry(entry4);
-
+
byte[] bytes = marshaller.objectToByteBuffer(b);
Bucket rb = (Bucket) marshaller.objectFromByteBuffer(bytes);
assert rb.getEntries().equals(b.getEntries()) : "Writen[" + b.getEntries() + "] and read[" + rb.getEntries() + "] objects should be the same";
}
-
+
public void testLongPutKeyValueCommand() throws Exception {
PutKeyValueCommand c = new PutKeyValueCommand("SESSION_173", "@TSXMHVROYNOFCJVEUJQGBCENNQDEWSCYSOHECJOHEICBEIGJVTIBB at TVNCWLTQCGTEJ@NBJLTMVGXCHXTSVE at BCRYGWPRVLXOJXBRJDVNBVXPRTRLBMHPOUYQKDEPDSADUAWPFSIOCINPSSFGABDUXRMTMMJMRTGBGBOAMGVMTKUDUAJGCAHCYW@LAXMDSFYOSXJXLUAJGQKPTHUKDOXRWKEFIVRTH at VIMQBGYPKWMS@HPOESTPIJE at OTOTWUWIOBLYKQQPTNGWVLRRCWHNIMWDQNOO@JHHEVYVQEODMWKFKKKSWURVDLXPTFQYIHLIM at GSBFWMDQGDQIJONNEVHGQTLDBRBML@BEWGHOQHHEBRFUQSLB@@CILXEAVQQBTXSITMBXHMHORHLTJF at MKMHQGHTSENWILTAKCCPVSQIPBVRAFSSEXIOVCPDXHUBIBUPBSCGPRECXEPMQHRHDOHIHVBPNDKOVLPCLKAJMNOTSF@SRXYVUEMQRCXVIETXVHOVNGYERBNM at RIMGHC@FNTUXSJSKALGHAFHGTFEANQUMBPUYFDSGLUYRRFDJHCW at JBWOBGMGTITAICRC@TPVCRKRMFPUSRRAHI at XOYKVGPHEBQD@@APEKSBCTBKREWAQGKHTJ at IHJD@YFSRDQPA at HKKELIJGFDYFEXFCOTCQIHKCQBLVDFHMGOWIDOWMVBDSJQOFGOIAPURRHVBGEJWYBUGGVHE@PU at NMQFMYTNYJDWPIADNVNCNYCCCPGODLAO@YYLVITEMNNKIFSDXKORJYWMFGKNYFPUQIC at AIDR@IWXCVALQBDOXRWIBXLKYTWDNHHSCUROAU at HVNENDAOP@RPTRIGLLLUNDQIDXJDDNF at P@PA at FEIBQKSKFQITTHDYGQRJMWPRLQC@NJVNVSKGOGYXPYS!
QHKPALKLFWNAOSQFTLEPVOII at RPDNRCVRDUMMFIVSWGIASUBMTGQSDGB@TBBYECFBRBGILJFCJ at JIQIQRVJXWIPGNVXKYATSPJTIPGCMCNPOKNEHBNUIAEQFQTYVLGAR@RVWVA at RMPBX@LRLJUEBUWO at PKXNIP@FKIQSVWKNO at FOJWDSIOLXHXJFBQPPVKKP@YKXPOOMBTLXMEHPRLLSFSVGMPXXNBCYVVSPNGMFBJUDCVOVGXPKVNTOFKVJUJOSDHSCOQRXOKBVP at WCUUFGMJAUQ@GRAGXICFCFICBSNASUBPAFRIPUK at OXOCCNOGTTSFVQKBQNB@DWGVEFSGTAXAPLBJ at SYHUNXWXPMR@KPFAJCIXPDURELFYPMUSLTJSQNDHHKJTIWCGNEKJF at CUWYTWLPNHYPHXNOGLSICKEFDULIXXSIGFMCQGURSRTUJDKRXBUUXIDFECMPXQX@CVYLDABEMFKUGBTBNMNBPCKCHWRJKSOGJFXMFYLLPUVUHBCNULEFAXPVKVKQKYCEFRUYPBRBDBDOVYLIQMQBLTUK at PRDCYBOKJGVUADFJFAFFXKJTNAJTHISWOSMVAYLIOGIORQQWFAKNU@KHPM at BYKTFSLSRHBATQTKUWSFAQS@Y at QIKCUWQYTODBRCYYYIAFMDVRURKVYJXHNGVLSQQFCXKLNUPCTEJSWIJUBFELSBUHANELHSIWLVQSSAIJRUEDOHHX@CKEBPOJRLRHEPLENSCDGEWXRTVUCSPFSAJUXDJOIUWFGPKHBVRVDMUUCPUDKRKVAXPSOBOPKPRRLFCKTLH at VGWKERASJYU@JAVWNBJGQOVF at QPSGJVEPAV@NAD@@FQRYPQIOAURILWXCKINPMBNUHPUID at YDQBHWAVDPPWRFKKGWJQTI@@OPSQ at ROUGHFNHCJBDFCHRLRTEMTUBWVCNOPYXKSSQDCXTOLOIIOCXBTPAUYDICFIXPJRB@CHFNXUCXANXY!
KXAISDSSLJGQOLBYXWHG@@KPARPCKOXAYVPDGRW at LDCRQBNMJREHWDYMXHEXAJ!
QKHBIRAV
HJQIVGOIXNINYQMJBXKM at DXESMBHLKHVSFDLVPOSOVMLHPSHQYY@DNMCGGGAJMHPVDLBGJP at EVDGLYBMD@NWHEYTBPIBPUPYOPOJVV at IVJXJMHIWWSIRKUWSR@U@@TDVMG at GRXVLCNEIISEVIVPOMJHKOWMRMITYDUQASWJIKVNYUFQVDT@BHTOMFXVFRKAARLNOGX at ADWCKHOVEMIGBWXINCUXEMVHSJJQDU@INTHDJQPSAQNAYONDBBFYGBTNGUSJHRKLCPHQMNLDHUQJPLLCDVTYLXTHJCBUXCRDY at YI@IQDCLJBBJC at NXGANXFIWPPNFVTDJWQ@@BIYJONOFP at RHTQEYPVHPPUS@UUENSNNF at WVGTSAVKDSQNMHP@VJORGTVWXVBPWKQNRWLSQFSBMXQKWRYMXPAYREXYGONKEWJMBCSLB at KSHXMIWMSBDGQWPDMUGVNMEWKMJKQECIRRVXBPBLGAFTUFHYSHLF@TGYETMDXRFAXVEUBSTGLSMWJMXJWMDPPDAFGNBMTQEMBDLRASMUMU at QTCDCPEGODHESDQVEIQYBJJPFXDLWPUNFAREYCY@YDDSTMKWCANNPXF@@WLMEXRPUNTWNOX at YKFNNTGMXIBBDA@TYLPJFNFHPQKMSNCLBME at FBPOIYNSDFBLHITKIFEFNXXOJAAFMRTGPALOANXF@YPY at RYTVOW@AKNM at C@LJKGBJMUYGGTXRHQCPOLNOGPPS at YSKAJSTQHLRBXUACXJYBLJSEHDNMLLUBSOIHQUI@VUNF at XAVRXUCYNCBDDGUDNVRYP@TPFPKGVNPTEDOTTUUFKCHQ at WWASQXLCBHNRBVSD@NVYT at GJQYSQGYPJO@WSEYDVKCBWANAFUWLDXOQYCYP at BSJFCBTXGKUNWLWUCYL@TNOWGDFHQTWQVYLQBBRQVMGNDBVXEFXTMMVYSHNVTTQAJCHKULOAJUSGJRPHQFCROWE at OMFUVRKGCWED@IA!
QGRLADOJGQKLCL at FCKTSITGMJRCCMPLOS@ONPQWFUROXYAUJQXIYVDCYBPYHPYCXNCRKRKLATLWWXLBLNOPUJFUJEDOIRKS at MMYPXIJNXPFOQJCHSCBEBGDUQYXQAWEEJDOSINXYLDXUJCQECU@WQSACTDFLGELHPGDFVDXFSSFOSYDLHQFVJESNAVAHKTUPBTPLSFSHYKLEXJXGWESVQQUTUPU at QXRTIDQ@IXBBOYINNHPEMTPRVRNJPQJFACFXUBKXOFHQSPOTLCQ at PLWGEFNKYCYFMKWPFUP@GLHKNMASGIENCACUISTG at YNQCNSOSBKOIXORKSHEOXHSMJJRUICJTCK@PWFRBPLXU at MUEMPFGDLUJEKD@ROUFBLKATXUCHEAQHEYDLCFDIRJSAXTV at CYMPQNMLTMFAHPRBLNSCVFBJMKQLAHWYIOLRMTOY@@RNKTUXHFYUMHGKCCGNEOIOQCISJEHCEVTTWM at TLFRIFDREHFBTTDEJRUNTWAEETGSVDOR@@UQNKFERMBVFJBOAYHPOKMSMRIERDA at JXYSJ@ORER at MBAVWCVGFNA@FRRPQSIIOIUGAJKVQXGINUUKPJPLQRMHPUBETEEIMIBPM at PETR@XD at DOHGRIBVXKLXQWHUFMTWEDYWFWRLPGDS@TANUXGIDTRVXKVCVEXYRKXQCTI at WNSFRAHJJGG@NIPPAAOJXQRTCLBYKDA at FFGHNUIGBFKOQMEDUEFELFLNKPCHA@OXJJRYNPDFSXIFSJYTDMSSBHDPUSQQDAVD at JAAWJDSVTERAJBFEPVRWKMYAPISPWLDPSRE@UMRQLXERTWRDLQVMVCOM at NYPXFLWMWKALMQVNJ@HCTMMIOLRWBJHCYFLMM at IWXPSHRRUNICSSWHOQHUVJE@HKJAADLBTPVLDAKCHRSURJCAXYTMYKHQMWDAWWASUW at HWGBVPTRHJGDWOGHPCNWSXTNKWONQGEKDDWGCKWVSAD!
@YLCCENMCHALHVDYQW at NQGNCY@M at GGV@RIR at OUS@PQIJMCFEIMGPYBXYR at NSIA!
UEXT at MOC
NWRMLYHUUAFJCCLLRNFGKLPPIIH at BYRME@UJAKIFHOV at ILP@BGXRNJBIBARSOIMTDSHMGPIGRJBGHYRYXPFUHVOOMCQFNLM at CNCBTGO@UKXBOICNVCRGHADYQVAMNSFRONJ at WITET@BSHMQLWYMVGMQJVSJOXOUJDSXYVVBQJSVGREQLIQKWC at BMDNONHXFYPQENSJINQYKHVCTUTG@QQYJKJURDCKJTUQAM at DWNXWRNILYVAAJ@IADBIXKEIHVXLXUVMGQPAQTWJCDMVDVYUDTXQTCYXDPHKBAGMTAMKEM at QNOQJBREXNWFCXNXRPGOGEIR@KQJIGXAWXLTNCX at ID@XNRNYGRF at QPNWEX@XH at XKSXLQTLQPFSHAHXJLHUTNQWFFAJYHBWIFVJELDPSPLRRDPPNXSBYBEREEELIWNVYXOXYJQAIGHALUAWNUSSNMBHBFLRMMTKEKNSINECUGWTDNMROXI@BJJXKSPIIIXOAJBFVSITQDXTODBGKEPJMWK at JOL@SWTCGSHCOPHECTPJFUXIHUOSVMUTNNSLLJDEOMAGIXEAAVILRMOJXVHHPNPUYYODMXYAYGHI at BUB@NLP at KNPCYFRWAFES@WISBACDSPELEVTJEBNRVENSXXEVDVC at RIDIDSBPQIQNNSRPS@HCJ at XPIOFDXHUBCNFQKHMUYLXW@LMFMALHLESSXCOULRWDTJIVKKTLGFE at HKGVKUGMVHWACQOTSVNWBNUUGTMSQEJ@DXJQQYPOWVRQNQKXSLOEAA@@FRDCGCCQWQ at IY@EATGQGQIETPIJHOIQRYWLTGUENQYDNQSBI at IAUDEWDKICHNUGNAIXNICMBK@CJGSASMTFKWOBSI at KULNENWXV@VNFOANM at OJHFVV@IYRMDB at LHSGXIJMMFCGJKTKDXSMY@FHDNY at VSDUORGWVFMVKJXOCCDLSLMHCSXFBTW@RQTFNRDJUIKRD at PWPY", false, null!
, 0, 0);
marshallAndAssertEquality(c);
}
-
+
public void testExceptionResponse() throws Exception {
ExceptionResponse er = new ExceptionResponse(new TimeoutException());
byte[] bytes = marshaller.objectToByteBuffer(er);
ExceptionResponse rer = (ExceptionResponse) marshaller.objectFromByteBuffer(bytes);
assert rer.getException().getClass().equals(er.getException().getClass()) : "Writen[" + er.getException().getClass() + "] and read[" + rer.getException().getClass() + "] objects should be the same";
}
-
+
public void testDuplicateExternalizerId() throws Exception {
JBossMarshaller jbmarshaller = new JBossMarshaller();
ConstantObjectTable.MARSHALLABLES.add(DuplicateIdClass.class.getName());
@@ -373,7 +373,7 @@
// AtomicHashMapDelta d = (AtomicHashMapDelta) marshaller.objectFromByteBuffer(bytes);
// assert d.getChangeLogSize() == ((AtomicHashMapDelta) m.delta()).getChangeLogSize();
// }
-
+
protected void marshallAndAssertEquality(Object writeObj) throws Exception {
byte[] bytes = marshaller.objectToByteBuffer(writeObj);
Object readObj = marshaller.objectFromByteBuffer(bytes);
@@ -423,9 +423,10 @@
public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
return null;
}
+
public void writeObject(ObjectOutput output, Object object) throws IOException {
}
}
}
-
+
}
Deleted: trunk/core/src/test/java/org/infinispan/statetransfer/Address.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/Address.java 2009-07-21 16:39:44 UTC (rev 602)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/Address.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -1,64 +0,0 @@
-package org.infinispan.statetransfer;
-
-import java.io.Serializable;
-
-public class Address implements Serializable {
- private static final long serialVersionUID = 5943073369866339615L;
-
- String street = null;
- String city = "San Jose";
- int zip = 0;
-
- public String getStreet() {
- return street;
- }
-
- public void setStreet(String street) {
- this.street = street;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public int getZip() {
- return zip;
- }
-
- public void setZip(int zip) {
- this.zip = zip;
- }
-
- public String toString() {
- return "street=" + getStreet() + ", city=" + getCity() + ", zip=" + getZip();
- }
-
-// public Object writeReplace() {
-// return this;
-// }
-
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- final Address address = (Address) o;
-
- if (zip != address.zip) return false;
- if (city != null ? !city.equals(address.city) : address.city != null) return false;
- if (street != null ? !street.equals(address.street) : address.street != null) return false;
-
- return true;
- }
-
- public int hashCode() {
- int result;
- result = (street != null ? street.hashCode() : 0);
- result = 29 * result + (city != null ? city.hashCode() : 0);
- result = 29 * result + zip;
- return result;
- }
-}
Deleted: trunk/core/src/test/java/org/infinispan/statetransfer/Person.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/Person.java 2009-07-21 16:39:44 UTC (rev 602)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/Person.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -1,56 +0,0 @@
-package org.infinispan.statetransfer;
-
-import java.io.Serializable;
-
-public class Person implements Serializable {
-
- private static final long serialVersionUID = -885384294556845285L;
-
- String name = null;
- Address address;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setName(Object obj) {
- this.name = (String) obj;
- }
-
- public Address getAddress() {
- return address;
- }
-
- public void setAddress(Address address) {
- this.address = address;
- }
-
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("name=").append(getName()).append(" Address= ").append(address);
- return sb.toString();
- }
-
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- final Person person = (Person) o;
-
- if (address != null ? !address.equals(person.address) : person.address != null) return false;
- if (name != null ? !name.equals(person.name) : person.name != null) return false;
-
- return true;
- }
-
- public int hashCode() {
- int result;
- result = (name != null ? name.hashCode() : 0);
- result = 29 * result + (address != null ? address.hashCode() : 0);
- return result;
- }
-}
Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java 2009-07-21 16:39:44 UTC (rev 602)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -10,7 +10,7 @@
import org.infinispan.test.TestingUtil;
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "statetransfer.StateTransferCacheLoaderFunctionalTest", enabled = false)
+ at Test(groups = "functional", testName = "statetransfer.StateTransferCacheLoaderFunctionalTest", enabled = true)
public class StateTransferCacheLoaderFunctionalTest extends StateTransferFunctionalTest {
int id;
ThreadLocal<Boolean> sharedCacheLoader = new ThreadLocal<Boolean>() {
Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java 2009-07-21 16:39:44 UTC (rev 602)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -5,6 +5,8 @@
import org.infinispan.manager.CacheManager;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
+import org.infinispan.test.data.Address;
+import org.infinispan.test.data.Person;
import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -16,7 +18,7 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
- at Test(groups = "functional", testName = "statetransfer.StateTransferFunctionalTest", enabled = false)
+ at Test(groups = "functional", testName = "statetransfer.StateTransferFunctionalTest", enabled = true)
public class StateTransferFunctionalTest extends MultipleCacheManagersTest {
protected static final String ADDRESS_CLASSNAME = Address.class.getName();
Copied: trunk/core/src/test/java/org/infinispan/test/data/Address.java (from rev 602, trunk/core/src/test/java/org/infinispan/statetransfer/Address.java)
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/data/Address.java (rev 0)
+++ trunk/core/src/test/java/org/infinispan/test/data/Address.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -0,0 +1,64 @@
+package org.infinispan.test.data;
+
+import java.io.Serializable;
+
+public class Address implements Serializable {
+ private static final long serialVersionUID = 5943073369866339615L;
+
+ String street = null;
+ String city = "San Jose";
+ int zip = 0;
+
+ public String getStreet() {
+ return street;
+ }
+
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public int getZip() {
+ return zip;
+ }
+
+ public void setZip(int zip) {
+ this.zip = zip;
+ }
+
+ public String toString() {
+ return "street=" + getStreet() + ", city=" + getCity() + ", zip=" + getZip();
+ }
+
+// public Object writeReplace() {
+// return this;
+// }
+
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ final Address address = (Address) o;
+
+ if (zip != address.zip) return false;
+ if (city != null ? !city.equals(address.city) : address.city != null) return false;
+ if (street != null ? !street.equals(address.street) : address.street != null) return false;
+
+ return true;
+ }
+
+ public int hashCode() {
+ int result;
+ result = (street != null ? street.hashCode() : 0);
+ result = 29 * result + (city != null ? city.hashCode() : 0);
+ result = 29 * result + zip;
+ return result;
+ }
+}
Property changes on: trunk/core/src/test/java/org/infinispan/test/data/Address.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/core/src/test/java/org/infinispan/test/data/Person.java (from rev 602, trunk/core/src/test/java/org/infinispan/statetransfer/Person.java)
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/data/Person.java (rev 0)
+++ trunk/core/src/test/java/org/infinispan/test/data/Person.java 2009-07-22 10:31:37 UTC (rev 603)
@@ -0,0 +1,56 @@
+package org.infinispan.test.data;
+
+import java.io.Serializable;
+
+public class Person implements Serializable {
+
+ private static final long serialVersionUID = -885384294556845285L;
+
+ String name = null;
+ Address address;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setName(Object obj) {
+ this.name = (String) obj;
+ }
+
+ public Address getAddress() {
+ return address;
+ }
+
+ public void setAddress(Address address) {
+ this.address = address;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("name=").append(getName()).append(" Address= ").append(address);
+ return sb.toString();
+ }
+
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ final Person person = (Person) o;
+
+ if (address != null ? !address.equals(person.address) : person.address != null) return false;
+ if (name != null ? !name.equals(person.name) : person.name != null) return false;
+
+ return true;
+ }
+
+ public int hashCode() {
+ int result;
+ result = (name != null ? name.hashCode() : 0);
+ result = 29 * result + (address != null ? address.hashCode() : 0);
+ return result;
+ }
+}
Property changes on: trunk/core/src/test/java/org/infinispan/test/data/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the infinispan-commits
mailing list