Fixed #79

ObjectToLiteral should not output null as record id.

Author: cboehme

src/main/java/org/culturegraph/mf/stream/converter/ObjectToLiteral.java

@@ -22,7 +22,7 @@
 
 /**
  * Outputs a record containing the input object as literal.
- * 
+ *
  * @param <T> input object type
  * @author Christoph Böhme
  */
@@ -32,24 +32,24 @@ public final class ObjectToLiteral<T> extends
 		DefaultObjectPipe<T, StreamReceiver> {
 
 	public static final String DEFAULT_LITERAL_NAME = "obj";
-	
+
 	private String literalName = DEFAULT_LITERAL_NAME;
-	
+
 	public void setLiteralName(final String literalName) {
 		this.literalName = literalName;
 	}
-	
+
 	public String getLiteralName() {
 		return literalName;
 	}
-	
+
 	@Override
 	public void process(final T obj) {
 		assert obj!=null;
 		assert !isClosed();
-		getReceiver().startRecord(null);
+		getReceiver().startRecord("");
 		getReceiver().literal(literalName, obj.toString());
 		getReceiver().endRecord();
 	}
-	
+
 }

src/test/java/org/culturegraph/mf/stream/converter/ObjectToLiteralTest.java

@@ -15,43 +15,64 @@
  */
 package org.culturegraph.mf.stream.converter;
 
-import org.culturegraph.mf.exceptions.FormatException;
-import org.culturegraph.mf.stream.converter.ObjectToLiteral;
-import org.culturegraph.mf.stream.sink.EventList;
-import org.culturegraph.mf.stream.sink.StreamValidator;
-import org.junit.Assert;
+import static org.mockito.Mockito.inOrder;
+
+import org.culturegraph.mf.framework.StreamReceiver;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
 
 /**
  * @author Christoph Böhme
  *
  */
 public final class ObjectToLiteralTest {
-	
+
 	private static final String LITERAL_NAME = "myObject";
 	private static final String OBJ_DATA = "This is a data object";
-	
+
+	private ObjectToLiteral<String> objectToLiteral;
+
+	@Mock
+	private StreamReceiver receiver;
+
+	@Before
+	public void setup() {
+		MockitoAnnotations.initMocks(this);
+		objectToLiteral = new ObjectToLiteral<String>();
+		objectToLiteral.setReceiver(receiver);
+	}
+
+	@After
+	public void cleanup() {
+		objectToLiteral.closeStream();
+	}
+
+	@Test
+	public void testShouldUseObjectAsLiteralValue() {
+
+		objectToLiteral.process(OBJ_DATA);
+
+		final InOrder ordered = inOrder(receiver);
+		ordered.verify(receiver).startRecord("");
+		ordered.verify(receiver).literal(ObjectToLiteral.DEFAULT_LITERAL_NAME, OBJ_DATA);
+		ordered.verify(receiver).endRecord();
+	}
+
 	@Test
-	public void test() {
-		final EventList buffer = new EventList();
-		buffer.startRecord(null);
-		buffer.literal(LITERAL_NAME, OBJ_DATA);
-		buffer.endRecord();
-		buffer.closeStream();
-		
-		final ObjectToLiteral<String> objectToLiteral = new ObjectToLiteral<String>();
+	public void testShouldUseCustomLiteralName() {
 		objectToLiteral.setLiteralName(LITERAL_NAME);
-		final StreamValidator validator = new StreamValidator(buffer.getEvents());
-		
-		objectToLiteral.setReceiver(validator);
-		
-		try {
-			objectToLiteral.process(OBJ_DATA);
-			objectToLiteral.closeStream();
-		} catch(FormatException e) {
-			Assert.fail(e.toString());
-		}
+
+		objectToLiteral.process(OBJ_DATA);
+
+		final InOrder ordered = inOrder(receiver);
+		ordered.verify(receiver).startRecord("");
+		ordered.verify(receiver).literal(LITERAL_NAME, OBJ_DATA);
+		ordered.verify(receiver).endRecord();
 	}
 
 }