geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject geode git commit: LuceneClientSecurityDUnitTest was not testing anything
Date Tue, 16 May 2017 21:02:28 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 973eb33e2 -> 3034ef64f


LuceneClientSecurityDUnitTest was not testing anything

This test was just creating lambdas without executing them. Changing the
test to actually run some tests.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3034ef64
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3034ef64
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3034ef64

Branch: refs/heads/develop
Commit: 3034ef64fdefee6266a21dc47d8d3a8be68d1959
Parents: 973eb33
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Fri May 12 15:34:02 2017 -0700
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Tue May 16 13:57:30 2017 -0700

----------------------------------------------------------------------
 .../lucene/LuceneClientSecurityDUnitTest.java   | 88 ++++++++------------
 1 file changed, 35 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/3034ef64/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
index 67103ff..3e6b541 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.security.NotAuthorizedException;
 import org.apache.geode.security.SimpleTestSecurityManager;
 import org.apache.geode.security.templates.UserPasswordAuthInit;
-import org.apache.geode.test.dunit.SerializableCallableIF;
 import org.apache.geode.test.dunit.SerializableRunnableIF;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
@@ -34,6 +33,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
 import java.util.Properties;
 
 import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
@@ -52,10 +52,7 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase
{
   public void verifySearchIndexPermissions(
       LuceneCommandsSecurityDUnitTest.UserNameAndExpectedResponse user) {
     // Start server
-    int serverPort = dataStore1.invoke(startCacheServer());
-
-    // Create index and region
-    dataStore1.invoke(() -> createIndexAndRegion());
+    int serverPort = dataStore1.invoke(() -> startCacheServer());
 
     // Start client
     accessor.invoke(() -> startClient(user.getUserName(), serverPort));
@@ -65,58 +62,43 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase
{
         () -> executeTextSearch(user.getExpectAuthorizationError(), user.getExpectedResponse()));
   }
 
-  private SerializableCallableIF<Integer> startCacheServer() {
-    return () -> {
-      Properties props = new Properties();
-      props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
-      final Cache cache = getCache(props);
-      final CacheServer server = cache.addCacheServer();
-      server.setPort(0);
-      server.start();
-      LuceneService luceneService = LuceneServiceProvider.get(cache);
-      luceneService.createIndexFactory().addField("text").create(INDEX_NAME, REGION_NAME);
-      cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
-      return server.getPort();
-    };
-  }
-
-  private SerializableRunnableIF createIndexAndRegion() {
-    return () -> {
-      Cache cache = getCache();
-      LuceneService luceneService = LuceneServiceProvider.get(cache);
-      luceneService.createIndexFactory().setFields("field1").create(INDEX_NAME, REGION_NAME);
-      cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
-    };
+  private int startCacheServer() throws IOException {
+    Properties props = new Properties();
+    props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
+    final Cache cache = getCache(props);
+    final CacheServer server = cache.addCacheServer();
+    server.setPort(0);
+    server.start();
+    LuceneService luceneService = LuceneServiceProvider.get(cache);
+    luceneService.createIndexFactory().addField("text").create(INDEX_NAME, REGION_NAME);
+    cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+    return server.getPort();
   }
 
-  private SerializableRunnableIF startClient(String userName, int serverPort) {
-    return () -> {
-      Properties props = new Properties();
-      props.setProperty("security-username", userName);
-      props.setProperty("security-password", userName);
-      props.setProperty(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName());
-      ClientCacheFactory clientCacheFactory = new ClientCacheFactory(props);
-      clientCacheFactory.addPoolServer("localhost", serverPort);
-      ClientCache clientCache = getClientCache(clientCacheFactory);
-      clientCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(REGION_NAME);
-    };
+  private void startClient(String userName, int serverPort) {
+    Properties props = new Properties();
+    props.setProperty("security-username", userName);
+    props.setProperty("security-password", userName);
+    props.setProperty(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName());
+    ClientCacheFactory clientCacheFactory = new ClientCacheFactory(props);
+    clientCacheFactory.addPoolServer("localhost", serverPort);
+    ClientCache clientCache = getClientCache(clientCacheFactory);
+    clientCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(REGION_NAME);
   }
 
-  private SerializableRunnableIF executeTextSearch(boolean expectAuthorizationError,
-      String expectedResponse) {
-    return () -> {
-      LuceneService service = LuceneServiceProvider.get(getCache());
-      LuceneQuery<Integer, TestObject> query =
-          service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "test", "text");
-      try {
-        query.findKeys();
-        assertFalse(expectAuthorizationError);
-      } catch (ServerOperationException e) {
-        assertTrue(e.getCause() != null && e.getCause() instanceof NotAuthorizedException);
-        assertTrue(expectAuthorizationError);
-        assertTrue(e.getLocalizedMessage().contains(expectedResponse));
-      }
-    };
+  private void executeTextSearch(boolean expectAuthorizationError, String expectedResponse)
+      throws LuceneQueryException {
+    LuceneService service = LuceneServiceProvider.get(getCache());
+    LuceneQuery<Integer, TestObject> query =
+        service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "test", "text");
+    try {
+      query.findKeys();
+      assertFalse(expectAuthorizationError);
+    } catch (ServerOperationException e) {
+      assertTrue(e.getCause() != null && e.getCause() instanceof NotAuthorizedException);
+      assertTrue(expectAuthorizationError);
+      assertTrue(e.getLocalizedMessage().contains(expectedResponse));
+    }
   }
 
   protected LuceneCommandsSecurityDUnitTest.UserNameAndExpectedResponse[] getSearchIndexUserNameAndExpectedResponses()
{


Mime
View raw message