/* Copyright (c) 2013 Boundless and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Distribution License v1.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/org/documents/edl-v10.html * * Contributors: * Victor Olaya (Boundless) - initial implementation */ package org.locationtech.geogig.test.integration; import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.locationtech.geogig.api.ObjectId; import org.locationtech.geogig.api.plumbing.merge.Conflict; import org.locationtech.geogig.api.plumbing.merge.ConflictsReadOp; import org.locationtech.geogig.api.plumbing.merge.ConflictsWriteOp; import com.google.common.collect.Lists; public class ConflictsReadWriteOpTest extends RepositoryTestCase { @Override protected void setUpInternal() throws Exception { } @Test public void testReadWriteConflicts() throws Exception { Conflict conflict = new Conflict(idP1, ObjectId.forString("ancestor"), ObjectId.forString("ours"), ObjectId.forString("theirs")); Conflict conflict2 = new Conflict(idP2, ObjectId.forString("ancestor2"), ObjectId.forString("ours2"), ObjectId.forString("theirs2")); ArrayList<Conflict> conflicts = Lists.newArrayList(conflict, conflict2); geogig.command(ConflictsWriteOp.class).setConflicts(conflicts).call(); List<Conflict> returnedConflicts = geogig.command(ConflictsReadOp.class).call(); assertEquals(conflicts, returnedConflicts); } }