Add a remote test for !=

stickfigure · stickfigure · commit e1b65a995e7b · 2022-09-23T13:19:40.000-07:00
The local emulator doesn't seem to support it
diff --git a/src/test/java/com/googlecode/objectify/test/RemoteQueryTests.java b/src/test/java/com/googlecode/objectify/test/RemoteQueryTests.java
@@ -0,0 +1,64 @@
+/*
+ */
+
+package com.googlecode.objectify.test;
+
+import com.googlecode.objectify.Key;
+import com.googlecode.objectify.test.entity.Trivial;
+import com.googlecode.objectify.test.util.LocalMemcacheExtension;
+import com.googlecode.objectify.test.util.MockitoExtension;
+import com.googlecode.objectify.test.util.RemoteObjectifyExtension;
+import com.googlecode.objectify.test.util.TestBase;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.googlecode.objectify.ObjectifyService.factory;
+import static com.googlecode.objectify.ObjectifyService.ofy;
+
+/**
+ * The datastore emulator does not yet support certain operations. These run against a production database.
+ */
+@ExtendWith({
+		MockitoExtension.class,
+		LocalMemcacheExtension.class,
+		RemoteObjectifyExtension.class,
+})
+class RemoteQueryTests extends TestBase {
+
+	/** */
+	private Trivial triv1;
+	private Trivial triv2;
+	private List<Key<Trivial>> keys;
+
+	/** */
+	@BeforeEach
+	void setUp() {
+		factory().register(Trivial.class);
+
+		this.triv1 = new Trivial("foo1", 1);
+		this.triv2 = new Trivial("foo2", 2);
+
+		final Map<Key<Trivial>, Trivial> result = ofy().save().entities(triv1, triv2).now();
+
+		this.keys = new ArrayList<>(result.keySet());
+	}
+
+	@Test
+	void testNotEquals() throws Exception {
+		{
+			final List<Trivial> result = ofy().load().type(Trivial.class).filter("someString !=", "foo1").list();
+			assertThat(result).containsExactly(triv2);
+		}
+
+		{
+			final List<Trivial> result = ofy().load().type(Trivial.class).filter("someString <>", "foo2").list();
+			assertThat(result).containsExactly(triv1);
+		}
+	}
+}
diff --git a/src/test/java/com/googlecode/objectify/test/util/ObjectifyExtension.java b/src/test/java/com/googlecode/objectify/test/util/ObjectifyExtension.java
@@ -1,6 +1,8 @@
 package com.googlecode.objectify.test.util;
 
 import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.testing.LocalDatastoreHelper;
+import com.google.common.base.Preconditions;
 import com.googlecode.objectify.ObjectifyFactory;
 import com.googlecode.objectify.ObjectifyService;
 import com.googlecode.objectify.util.Closeable;
@@ -19,8 +21,13 @@ public class ObjectifyExtension implements BeforeEachCallback, AfterEachCallback
 
 	@Override
 	public void beforeEach(final ExtensionContext context) throws Exception {
-		final Datastore datastore = LocalDatastoreExtension.getHelper(context).getOptions().getService();
+		final LocalDatastoreHelper helper = LocalDatastoreExtension.getHelper(context);
+		Preconditions.checkNotNull(helper, "This extension depends on " + LocalDatastoreExtension.class.getSimpleName());
+
+		final Datastore datastore = helper.getOptions().getService();
+
 		final MemcachedClient memcachedClient = LocalMemcacheExtension.getClient(context);
+		Preconditions.checkNotNull(memcachedClient, "This extension depends on " + LocalMemcacheExtension.class.getSimpleName());
 
 		ObjectifyService.init(new ObjectifyFactory(datastore, memcachedClient));
 
diff --git a/src/test/java/com/googlecode/objectify/test/util/RemoteObjectifyExtension.java b/src/test/java/com/googlecode/objectify/test/util/RemoteObjectifyExtension.java
@@ -0,0 +1,49 @@
+package com.googlecode.objectify.test.util;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.testing.LocalDatastoreHelper;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import com.google.common.base.Preconditions;
+import com.googlecode.objectify.ObjectifyFactory;
+import com.googlecode.objectify.ObjectifyService;
+import com.googlecode.objectify.util.Closeable;
+import net.spy.memcached.MemcachedClient;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+
+/**
+ * Sets up and tears down the RemoteTestHelper, initializes objectify.
+ * To use this, you will need GOOGLE_APPLICATION_CREDENTIALS set to a relevant service account key file.
+ */
+public class RemoteObjectifyExtension implements BeforeEachCallback, AfterEachCallback {
+
+	private static final Namespace NAMESPACE = Namespace.create(RemoteObjectifyExtension.class);
+
+	@Override
+	public void beforeEach(final ExtensionContext context) throws Exception {
+		final MemcachedClient memcachedClient = LocalMemcacheExtension.getClient(context);
+		Preconditions.checkNotNull(memcachedClient, "This extension depends on " + LocalMemcacheExtension.class.getSimpleName());
+
+		final RemoteDatastoreHelper helper = RemoteDatastoreHelper.create();
+		context.getStore(NAMESPACE).put(RemoteDatastoreHelper.class, helper);
+
+		final Datastore datastore = helper.getOptions().getService();
+
+		ObjectifyService.init(new ObjectifyFactory(datastore, memcachedClient));
+
+		final Closeable rootService = ObjectifyService.begin();
+
+		context.getStore(NAMESPACE).put(Closeable.class, rootService);
+	}
+
+	@Override
+	public void afterEach(final ExtensionContext context) throws Exception {
+		final Closeable rootService = context.getStore(NAMESPACE).get(Closeable.class, Closeable.class);
+		rootService.close();
+
+		final RemoteDatastoreHelper helper = context.getStore(NAMESPACE).get(RemoteDatastoreHelper.class, RemoteDatastoreHelper.class);
+		helper.deleteNamespace();
+	}
+}
