From 2ce190a1fe3e30a366c20ceb611d0f838842f82d Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 12 Aug 2020 09:02:42 +0200 Subject: Revert "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, 87 insertions(+), 99 deletions(-) (limited to 'docproc/src') 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 a9bd63d96c3..09d25f60835 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,7 +24,6 @@ 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 8d3e387a0c5..e72b9d991b6 100644 --- a/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java @@ -7,8 +7,10 @@ import org.junit.Test; import java.util.Iterator; import java.util.Map; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge @@ -18,8 +20,8 @@ public class ProcessingTestCase { @Test public void serviceName() { - assertThat(new Processing().getServiceName(), is("default")); - assertThat(new Processing("foobar", (DocumentOperation) null, null).getServiceName(), is("foobar")); + assertEquals("default", new Processing().getServiceName()); + assertEquals("foobar", new Processing("foobar", (DocumentOperation) null, null).getServiceName()); } @Test @@ -30,21 +32,21 @@ public class ProcessingTestCase { p.setVariable("bar", "apple"); Iterator> it = p.getVariableAndNameIterator(); - 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(it.hasNext()); + assertNotNull(it.next()); + assertTrue(it.hasNext()); + assertNotNull(it.next()); + assertFalse(it.hasNext()); - assertThat(p.hasVariable("foo"), is(true)); - assertThat(p.hasVariable("bar"), is(true)); - assertThat(p.hasVariable("baz"), is(false)); + assertTrue(p.hasVariable("foo")); + assertTrue(p.hasVariable("bar")); + assertFalse(p.hasVariable("baz")); - assertThat(p.removeVariable("foo"), is("banana")); + assertEquals("banana", p.removeVariable("foo")); p.clearVariables(); it = p.getVariableAndNameIterator(); - assertThat(it.hasNext(), is(false)); + assertFalse(it.hasNext()); } } diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java index c89ac21610e..741d10bdc43 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.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge @@ -60,14 +60,12 @@ public class SimpleDocumentProcessorTestCase { DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); service.getExecutor().process(p); - 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")); + 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()); } @Test @@ -78,10 +76,9 @@ public class SimpleDocumentProcessorTestCase { DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); service.getExecutor().process(p); - 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")); + assertEquals(1, p.getDocumentOperations().size()); + assertTrue(p.getDocumentOperations().get(0) instanceof DocumentPut); + assertEquals("processed", ((DocumentPut) p.getDocumentOperations().get(0)).getDocument().getFieldValue("title").getWrappedValue()); } @Test @@ -99,16 +96,13 @@ public class SimpleDocumentProcessorTestCase { //ok } - 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()); + 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")); } 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 5893013a187..c508e7da61d 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java @@ -30,12 +30,10 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; 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 @@ -72,7 +70,7 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertThat(result, instanceOf(GetDocumentMessage.class)); + assertTrue(result instanceof GetDocumentMessage); assertFalse(reply.hasErrors()); } @@ -91,9 +89,9 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertThat(result, instanceOf(PutDocumentMessage.class)); + assertTrue(result instanceof PutDocumentMessage); PutDocumentMessage outputMsg = (PutDocumentMessage) result; - assertThat(((StringFieldValue) outputMsg.getDocumentPut().getDocument().getFieldValue("blahblah")).getString(), is("THIS IS A TEST.")); + assertEquals("THIS IS A TEST.", ((StringFieldValue) outputMsg.getDocumentPut().getDocument().getFieldValue("blahblah")).getString()); assertFalse(reply.hasErrors()); } @@ -109,9 +107,9 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertThat(result, instanceOf(RemoveDocumentMessage.class)); + assertTrue(result instanceof RemoveDocumentMessage); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage) result; - assertThat(outputMsg.getDocumentId().toString(), is("id:ns:baz::12345:6789")); + assertEquals("id:ns:baz::12345:6789", outputMsg.getDocumentId().toString()); assertFalse(reply.hasErrors()); } @@ -128,9 +126,9 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertThat(result, instanceOf(UpdateDocumentMessage.class)); + assertTrue(result instanceof UpdateDocumentMessage); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage) result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:ns:baz::foo")); + assertEquals("id:ns:baz::foo", outputMsg.getDocumentUpdate().getId().toString()); 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 01b66bc2fb6..9dc0b2a38f5 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java @@ -19,11 +19,9 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -51,11 +49,11 @@ public class DocumentProcessingHandlerBasicTestCase extends DocumentProcessingHa Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); - assertThat((msg instanceof PutDocumentMessage), is(true)); + assertTrue((msg instanceof PutDocumentMessage)); PutDocumentMessage put = (PutDocumentMessage) msg; Document outDoc = put.getDocumentPut().getDocument(); - assertThat(document, equalTo(outDoc)); + assertEquals(document, 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 df3224827ef..f15b505d05f 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java @@ -7,10 +7,8 @@ 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 00efab737c4..01ea5fd2fc9 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java @@ -29,9 +29,10 @@ import java.util.List; import java.util.ListIterator; import java.util.concurrent.TimeUnit; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge @@ -85,30 +86,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); - assertThat(result, instanceOf(PutDocumentMessage.class)); + assertTrue(result instanceof PutDocumentMessage); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertThat(outputMsg.getDocumentPut().getDocument().getFieldValue("foostring").toString(), is("banana")); + assertEquals("banana", outputMsg.getDocumentPut().getDocument().getFieldValue("foostring").toString()); } { PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:remove"))); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(RemoveDocumentMessage.class)); + assertTrue(result instanceof RemoveDocumentMessage); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::put:to:remove")); + assertEquals("id:nodocstatus:foo::put:to:remove", outputMsg.getDocumentId().toString()); } { PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:update"))); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(UpdateDocumentMessage.class)); + assertTrue(result instanceof UpdateDocumentMessage); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::put:to:update")); + assertEquals("id:nodocstatus:foo::put:to:update", outputMsg.getDocumentUpdate().getId().toString()); } { 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); - assertThat(reply, instanceOf(DocumentReply.class)); + assertTrue(reply instanceof DocumentReply); assertFalse(reply.hasErrors()); } } @@ -117,31 +118,31 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:put")); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(PutDocumentMessage.class)); + assertTrue(result instanceof PutDocumentMessage); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("id:nodocstatus:foo::remove:to:put")); + assertEquals("id:nodocstatus:foo::remove:to:put", outputMsg.getDocumentPut().getDocument().getId().toString()); } { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:remove")); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(RemoveDocumentMessage.class)); + assertTrue(result instanceof RemoveDocumentMessage); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::remove:to:remove")); + assertEquals("id:nodocstatus:foo::remove:to:remove", outputMsg.getDocumentId().toString()); } { RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:update")); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(UpdateDocumentMessage.class)); + assertTrue(result instanceof UpdateDocumentMessage); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::remove:to:update")); + assertEquals("id:nodocstatus:foo::remove:to:update", outputMsg.getDocumentUpdate().getId().toString()); } { 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); - assertThat(reply, instanceOf(DocumentReply.class)); + assertTrue(reply instanceof DocumentReply); assertFalse(reply.hasErrors()); } } @@ -150,31 +151,31 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:put")); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(PutDocumentMessage.class)); + assertTrue(result instanceof PutDocumentMessage); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("id:nodocstatus:foo::update:to:put")); + assertEquals("id:nodocstatus:foo::update:to:put", outputMsg.getDocumentPut().getDocument().getId().toString()); } { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:remove")); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(RemoveDocumentMessage.class)); + assertTrue(result instanceof RemoveDocumentMessage); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::update:to:remove")); + assertEquals("id:nodocstatus:foo::update:to:remove", outputMsg.getDocumentId().toString()); } { UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:update")); Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(UpdateDocumentMessage.class)); + assertTrue(result instanceof UpdateDocumentMessage); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::update:to:update")); + assertEquals("id:nodocstatus:foo::update:to:update", outputMsg.getDocumentUpdate().getId().toString()); } { 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); - assertThat(reply, instanceOf(DocumentReply.class)); + assertTrue(reply instanceof DocumentReply); 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 c4f65987692..aa55d5b6a41 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java @@ -12,17 +12,15 @@ import com.yahoo.document.datatypes.Array; import com.yahoo.document.datatypes.StringFieldValue; import org.junit.Test; -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.assertNull; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings({"unchecked","rawtypes"}) +@SuppressWarnings({"unchecked"}) public class SplitterJoinerTestCase { @Test @@ -40,7 +38,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")); @@ -56,17 +54,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()); - 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)); + 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")); assertTrue(innerArray.isEmpty()); @@ -74,13 +72,13 @@ public class SplitterJoinerTestCase { joiner.process(p); - 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)); + 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)); } } -- cgit v1.2.3