From 5858a6cdae398b95360c5d031e56037799930895 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 11 Aug 2020 23:29:08 +0200 Subject: Revert "Reduce the use of hamcrest when normal assertEquals/assertTrue does a…" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jdisc/messagebus/MbusRequestContext.java | 1 + .../java/com/yahoo/docproc/ProcessingTestCase.java | 30 +++++++------ .../docproc/SimpleDocumentProcessorTestCase.java | 44 ++++++++++--------- ...ntProcessingHandlerAllMessageTypesTestCase.java | 18 ++++---- .../DocumentProcessingHandlerBasicTestCase.java | 8 ++-- .../jdisc/DocumentProcessingHandlerTestBase.java | 2 + ...cessingHandlerTransformingMessagesTestCase.java | 49 +++++++++++----------- .../yahoo/docproc/util/SplitterJoinerTestCase.java | 34 ++++++++------- 8 files changed, 99 insertions(+), 87 deletions(-) (limited to 'docproc') diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java index 09d25f60835..a9bd63d96c3 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java @@ -24,6 +24,7 @@ import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Reply; import com.yahoo.messagebus.jdisc.MbusRequest; import com.yahoo.messagebus.jdisc.MbusResponse; +import com.yahoo.messagebus.routing.Route; import java.net.URI; import java.util.ArrayList; diff --git a/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java index e72b9d991b6..8d3e387a0c5 100644 --- a/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java @@ -7,10 +7,8 @@ import org.junit.Test; import java.util.Iterator; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.assertThat; /** * @author Einar M R Rosenvinge @@ -20,8 +18,8 @@ public class ProcessingTestCase { @Test public void serviceName() { - assertEquals("default", new Processing().getServiceName()); - assertEquals("foobar", new Processing("foobar", (DocumentOperation) null, null).getServiceName()); + assertThat(new Processing().getServiceName(), is("default")); + assertThat(new Processing("foobar", (DocumentOperation) null, null).getServiceName(), is("foobar")); } @Test @@ -32,21 +30,21 @@ public class ProcessingTestCase { p.setVariable("bar", "apple"); Iterator> it = p.getVariableAndNameIterator(); - assertTrue(it.hasNext()); - assertNotNull(it.next()); - assertTrue(it.hasNext()); - assertNotNull(it.next()); - assertFalse(it.hasNext()); + assertThat(it.hasNext(), is(true)); + assertThat(it.next(), not(nullValue())); + assertThat(it.hasNext(), is(true)); + assertThat(it.next(), not(nullValue())); + assertThat(it.hasNext(), is(false)); - assertTrue(p.hasVariable("foo")); - assertTrue(p.hasVariable("bar")); - assertFalse(p.hasVariable("baz")); + assertThat(p.hasVariable("foo"), is(true)); + assertThat(p.hasVariable("bar"), is(true)); + assertThat(p.hasVariable("baz"), is(false)); - assertEquals("banana", p.removeVariable("foo")); + assertThat(p.removeVariable("foo"), is("banana")); p.clearVariables(); it = p.getVariableAndNameIterator(); - assertFalse(it.hasNext()); + assertThat(it.hasNext(), is(false)); } } diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java index 741d10bdc43..c89ac21610e 100644 --- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java @@ -15,9 +15,9 @@ import com.yahoo.document.idstring.IdIdString; import com.yahoo.statistics.StatisticsImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.Assert.assertThat; /** * @author Einar M R Rosenvinge @@ -60,12 +60,14 @@ public class SimpleDocumentProcessorTestCase { DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); service.getExecutor().process(p); - assertEquals(3, p.getDocumentOperations().size()); - assertTrue(p.getDocumentOperations().get(0) instanceof DocumentPut); - assertEquals("processed", ((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue()); - assertTrue(p.getDocumentOperations().get(1) instanceof DocumentUpdate); - assertTrue(p.getDocumentOperations().get(2) instanceof DocumentRemove); - assertEquals("id:foobar:foobar::12345", p.getDocumentOperations().get(2).getId().toString()); + assertThat(p.getDocumentOperations().size(), is(3)); + assertThat(p.getDocumentOperations().get(0) instanceof DocumentPut, is(true)); + assertThat(((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue(), + is("processed")); + assertThat(p.getDocumentOperations().get(1) instanceof DocumentUpdate, is(true)); + assertThat(p.getDocumentOperations().get(2) instanceof DocumentRemove, is(true)); + assertThat(p.getDocumentOperations().get(2).getId().toString(), + is("id:foobar:foobar::12345")); } @Test @@ -76,9 +78,10 @@ public class SimpleDocumentProcessorTestCase { DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); service.getExecutor().process(p); - assertEquals(1, p.getDocumentOperations().size()); - assertTrue(p.getDocumentOperations().get(0) instanceof DocumentPut); - assertEquals("processed", ((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue()); + assertThat(p.getDocumentOperations().size(), is(1)); + assertThat(p.getDocumentOperations().get(0) instanceof DocumentPut, is(true)); + assertThat(((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue(), + is("processed")); } @Test @@ -96,13 +99,16 @@ public class SimpleDocumentProcessorTestCase { //ok } - assertEquals(3, p.getDocumentOperations().size()); - assertTrue(p.getDocumentOperations().get(0) instanceof DocumentPut); - assertEquals("processed", ((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue()); - assertTrue(p.getDocumentOperations().get(1) instanceof DocumentRemove); - assertEquals("id:this:foobar::is:a:remove", p.getDocumentOperations().get(1).getId().toString()); - assertTrue(p.getDocumentOperations().get(2) instanceof DocumentPut); - assertNull(((DocumentPut) p.getDocumentOperations().get(2)).getDocument().getFieldValue("title")); + assertThat(p.getDocumentOperations().size(), is(3)); + assertThat(p.getDocumentOperations().get(0) instanceof DocumentPut, is(true)); + assertThat(((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue(), + is("processed")); + assertThat(p.getDocumentOperations().get(1) instanceof DocumentRemove, is(true)); + assertThat(p.getDocumentOperations().get(1).getId().toString(), + is("id:this:foobar::is:a:remove")); + assertThat(p.getDocumentOperations().get(2) instanceof DocumentPut, is(true)); + assertThat(((DocumentPut) p.getDocumentOperations().get(2)).getDocument().getFieldValue("title"), + nullValue()); } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java index c508e7da61d..5893013a187 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java @@ -30,10 +30,12 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; /** * @author Einar M R Rosenvinge @@ -70,7 +72,7 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(result instanceof GetDocumentMessage); + assertThat(result, instanceOf(GetDocumentMessage.class)); assertFalse(reply.hasErrors()); } @@ -89,9 +91,9 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(result instanceof PutDocumentMessage); + assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage) result; - assertEquals("THIS IS A TEST.", ((StringFieldValue) outputMsg.getDocumentPut().getDocument().getFieldValue("blahblah")).getString()); + assertThat(((StringFieldValue) outputMsg.getDocumentPut().getDocument().getFieldValue("blahblah")).getString(), is("THIS IS A TEST.")); assertFalse(reply.hasErrors()); } @@ -107,9 +109,9 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(result instanceof RemoveDocumentMessage); + assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage) result; - assertEquals("id:ns:baz::12345:6789", outputMsg.getDocumentId().toString()); + assertThat(outputMsg.getDocumentId().toString(), is("id:ns:baz::12345:6789")); assertFalse(reply.hasErrors()); } @@ -126,9 +128,9 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(result instanceof UpdateDocumentMessage); + assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage) result; - assertEquals("id:ns:baz::foo", outputMsg.getDocumentUpdate().getId().toString()); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:ns:baz::foo")); assertFalse(reply.hasErrors()); } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java index 9dc0b2a38f5..01b66bc2fb6 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java @@ -19,9 +19,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -49,11 +51,11 @@ public class DocumentProcessingHandlerBasicTestCase extends DocumentProcessingHa Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue((msg instanceof PutDocumentMessage)); + assertThat((msg instanceof PutDocumentMessage), is(true)); PutDocumentMessage put = (PutDocumentMessage) msg; Document outDoc = put.getDocumentPut().getDocument(); - assertEquals(document, outDoc); + assertThat(document, equalTo(outDoc)); assertFalse(reply.hasErrors()); } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java index f15b505d05f..df3224827ef 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java @@ -7,8 +7,10 @@ import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.core.document.ContainerDocumentConfig; import com.yahoo.container.jdisc.messagebus.MbusServerProvider; import com.yahoo.container.jdisc.messagebus.SessionCache; +import com.yahoo.docproc.AbstractConcreteDocumentFactory; import com.yahoo.docproc.CallStack; import com.yahoo.docproc.DocprocService; +import com.yahoo.docproc.DocumentProcessor; import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext; import com.yahoo.document.DocumentType; diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java index 01ea5fd2fc9..00efab737c4 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java @@ -29,10 +29,9 @@ import java.util.List; import java.util.ListIterator; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.*; /** * @author Einar M R Rosenvinge @@ -86,30 +85,30 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum { PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:put"))); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof PutDocumentMessage); + assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertEquals("banana", outputMsg.getDocumentPut().getDocument().getFieldValue("foostring").toString()); + assertThat(outputMsg.getDocumentPut().getDocument().getFieldValue("foostring").toString(), is("banana")); } { PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:remove"))); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof RemoveDocumentMessage); + assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertEquals("id:nodocstatus:foo::put:to:remove", outputMsg.getDocumentId().toString()); + assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::put:to:remove")); } { PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:update"))); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof UpdateDocumentMessage); + assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertEquals("id:nodocstatus:foo::put:to:update", outputMsg.getDocumentUpdate().getId().toString()); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::put:to:update")); } { PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:nothing"))); assertTrue(sendMessage(FOOBAR, message)); Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(reply instanceof DocumentReply); + assertThat(reply, instanceOf(DocumentReply.class)); assertFalse(reply.hasErrors()); } } @@ -118,31 +117,31 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:put")); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof PutDocumentMessage); + assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertEquals("id:nodocstatus:foo::remove:to:put", outputMsg.getDocumentPut().getDocument().getId().toString()); + assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("id:nodocstatus:foo::remove:to:put")); } { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:remove")); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof RemoveDocumentMessage); + assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertEquals("id:nodocstatus:foo::remove:to:remove", outputMsg.getDocumentId().toString()); + assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::remove:to:remove")); } { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:update")); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof UpdateDocumentMessage); + assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertEquals("id:nodocstatus:foo::remove:to:update", outputMsg.getDocumentUpdate().getId().toString()); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::remove:to:update")); } { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:nothing")); assertTrue(sendMessage(FOOBAR, message)); Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(reply instanceof DocumentReply); + assertThat(reply, instanceOf(DocumentReply.class)); assertFalse(reply.hasErrors()); } } @@ -151,31 +150,31 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:put")); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof PutDocumentMessage); + assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertEquals("id:nodocstatus:foo::update:to:put", outputMsg.getDocumentPut().getDocument().getId().toString()); + assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("id:nodocstatus:foo::update:to:put")); } { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:remove")); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof RemoveDocumentMessage); + assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertEquals("id:nodocstatus:foo::update:to:remove", outputMsg.getDocumentId().toString()); + assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::update:to:remove")); } { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:update")); Routable result = sendMessageAndGetResult(message); - assertTrue(result instanceof UpdateDocumentMessage); + assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertEquals("id:nodocstatus:foo::update:to:update", outputMsg.getDocumentUpdate().getId().toString()); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::update:to:update")); } { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:nothing")); assertTrue(sendMessage(FOOBAR, message)); Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertTrue(reply instanceof DocumentReply); + assertThat(reply, instanceOf(DocumentReply.class)); assertFalse(reply.hasErrors()); } } diff --git a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java index aa55d5b6a41..c4f65987692 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java @@ -12,15 +12,17 @@ import com.yahoo.document.datatypes.Array; import com.yahoo.document.datatypes.StringFieldValue; import org.junit.Test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings({"unchecked"}) +@SuppressWarnings({"unchecked","rawtypes"}) public class SplitterJoinerTestCase { @Test @@ -38,7 +40,7 @@ public class SplitterJoinerTestCase { DocumentTypeManager manager = splitter.manager; - // Create documents + /**** Create documents: ****/ Document inner1 = new Document(manager.getDocumentType("docindoc"), "id:inner:docindoc::one"); inner1.setFieldValue("name", new StringFieldValue("Donald Duck")); @@ -54,17 +56,17 @@ public class SplitterJoinerTestCase { Document outer = new Document(manager.getDocumentType("outerdoc"), "id:outer:outerdoc::the:only:one"); outer.setFieldValue("innerdocuments", innerArray); - // End create documents + /**** End create documents ****/ Processing p = Processing.of(new DocumentPut(outer)); splitter.process(p); assertEquals(2, p.getDocumentOperations().size()); - assertSame(inner1, ((DocumentPut)(p.getDocumentOperations().get(0))).getDocument()); - assertSame(inner2, ((DocumentPut)(p.getDocumentOperations().get(1))).getDocument()); - assertSame(outer, ((DocumentPut)(p.getVariable(cfg.contextFieldName()))).getDocument()); - assertSame(innerArray, outer.getFieldValue("innerdocuments")); + assertThat(((DocumentPut)(p.getDocumentOperations().get(0))).getDocument(), sameInstance(inner1)); + assertThat(((DocumentPut)(p.getDocumentOperations().get(1))).getDocument(), sameInstance(inner2)); + assertThat(((DocumentPut)(p.getVariable(cfg.contextFieldName()))).getDocument(), sameInstance(outer)); + assertThat(outer.getFieldValue("innerdocuments"), sameInstance(innerArray)); assertTrue(innerArray.isEmpty()); @@ -72,13 +74,13 @@ public class SplitterJoinerTestCase { joiner.process(p); - assertEquals(1, p.getDocumentOperations().size()); - assertSame(outer, ((DocumentPut)p.getDocumentOperations().get(0)).getDocument()); - assertNull(p.getVariable(cfg.contextFieldName())); - assertSame(innerArray, outer.getFieldValue("innerdocuments")); - assertEquals(2, innerArray.size()); - assertSame(inner1, innerArray.get(0)); - assertSame(inner2, innerArray.get(1)); + assertThat(p.getDocumentOperations().size(), equalTo(1)); + assertThat(((DocumentPut)p.getDocumentOperations().get(0)).getDocument(), sameInstance(outer)); + assertThat(p.getVariable(cfg.contextFieldName()), nullValue()); + assertThat(outer.getFieldValue("innerdocuments"), sameInstance(innerArray)); + assertThat(innerArray.size(), equalTo(2)); + assertThat(innerArray.get(0), sameInstance(inner1)); + assertThat(innerArray.get(1), sameInstance(inner2)); } } -- cgit v1.2.3