You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/29 21:23:30 UTC
[49/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-693
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b7997447/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b7997447/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index 9a5bab3,965c436..4be434a
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@@ -40,23 -31,38 +40,23 @@@ import com.gemstone.gemfire.cache.query
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
import com.gemstone.gemfire.cache.query.internal.cq.ClientCQImpl;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator;
import com.gemstone.gemfire.security.generator.CredentialGenerator;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
-/**
- *
- */
-public class MultiuserDurableCQAuthzDUnitTest extends
- ClientAuthorizationTestBase {
-
- public static final Map<String, String> cqNameToQueryStrings = new HashMap<String, String>();
-
- static {
- cqNameToQueryStrings.put("CQ_0", "SELECT * FROM ");
- cqNameToQueryStrings.put("CQ_1", "SELECT * FROM ");
- }
+@Category(DistributedTest.class)
+public class MultiUserDurableCQAuthzDUnitTest extends ClientAuthorizationTestBase {
-
+
- public MultiuserDurableCQAuthzDUnitTest(String name) {
- super(name);
- }
+ private final Map<String, String> cqNameToQueryStrings = new HashMap<>();
@Override
- public final void postSetUp() throws Exception {
+ public final void preSetUpClientAuthorizationTestBase() throws Exception {
getSystem();
- Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
+ invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
getSystem();
}