DATACOUCH-173 - Add cleanup on some integration tests

This commit is contained in:
Simon Baslé
2015-11-13 18:11:43 +01:00
parent 2378e7145b
commit b78ed124ec
2 changed files with 21 additions and 11 deletions

View File

@@ -36,8 +36,10 @@ import java.util.Random;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.document.RawJsonDocument;
import com.couchbase.client.java.error.DocumentDoesNotExistException;
import com.couchbase.client.java.query.N1qlParams;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.query.N1qlQueryResult;
import com.couchbase.client.java.query.consistency.ScanConsistency;
import com.couchbase.client.java.query.dsl.Expression;
import com.couchbase.client.java.view.Stale;
import com.couchbase.client.java.view.ViewQuery;
@@ -242,9 +244,11 @@ public class CouchbaseTemplateTests {
template.save(Arrays.asList(ff1, ff2));
N1qlQuery query = N1qlQuery.simple(select(i("value")) //"value" is a n1ql keyword apparently
.from(i(client.name()))
.where(x("type").eq(s("fullFragment"))
.and(x("criteria").gt(1))));
.from(i(client.name()))
.where(x("type").eq(s("fullFragment"))
.and(x("criteria").gt(1))),
N1qlParams.build().consistency(ScanConsistency.REQUEST_PLUS));
List<Fragment> fragments = template.findByN1QLProjection(query, Fragment.class);
assertNotNull(fragments);

View File

@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.List;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.error.DocumentDoesNotExistException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -57,8 +58,12 @@ public class N1qlCrudRepositoryTests {
private PartyRepository partyRepository;
private ItemRepository itemRepository;
private static final Item item = new Item("itemNotParty", "short description");
private static final Party party = new Party("partyNotItem", "partyName", "short description", new Date(), 120, new Point(500, 500));
private static final String KEY_ITEM = "itemNotParty";
private static final String KEY_PARTY = "partyNotItem";
private static final String KEY_PARTY_KEYWORD = "partyHasKeyword";
private static final Item item = new Item(KEY_ITEM, "short description");
private static final Party party = new Party(KEY_PARTY, "partyName", "short description", new Date(), 120, new Point(500, 500));
@Before
public void setup() throws Exception {
@@ -71,8 +76,9 @@ public class N1qlCrudRepositoryTests {
@After
public void cleanUp() {
itemRepository.delete("itemNotParty");
partyRepository.delete("partyNotItem");
try { itemRepository.delete(KEY_ITEM); } catch (DocumentDoesNotExistException e) {}
try { partyRepository.delete(KEY_PARTY); } catch (DocumentDoesNotExistException e) {}
try { partyRepository.delete(KEY_PARTY_KEYWORD); } catch (DocumentDoesNotExistException e) {}
}
@Test
@@ -89,12 +95,12 @@ public class N1qlCrudRepositoryTests {
@Test
public void shouldSaveObjectWithN1qlKeywordField() {
Party party = new Party("partyHasKeyword", "party", "desc is a N1QL keyword", new Date(), 40, new Point(500, 500));
partyRepository.save(party);
Party partyHasKeyword = new Party(KEY_PARTY_KEYWORD, "party", "desc is a N1QL keyword", new Date(), 40, new Point(500, 500));
partyRepository.save(partyHasKeyword);
List<Object> parties = partyRepository.findAllByDescriptionNotNull();
assertTrue(client.exists("partyHasKeyword"));
assertTrue(parties.contains(party));
assertTrue(client.exists(KEY_PARTY_KEYWORD));
assertTrue(parties.contains(partyHasKeyword));
for (Object o : parties) {
if (!(o instanceof Party)) {
fail("expected only Party objects");