moves help methods to utils class

Signed-off-by: Ruslan Sennov <ruslan.sennov@gmail.com>
eclipse-vertx · Feb 15, 2017 · 8c8e7df · 8c8e7df
1 parent f56e788
commit 8c8e7df
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 42 deletions.
diff --git a/src/test/java/io/vertx/test/core/Http1xTest.java b/src/test/java/io/vertx/test/core/Http1xTest.java
@@ -386,48 +386,6 @@ public void testServerOptions() {
     assertTrue(options.isDecompressionSupported());
   }
 
-  private static KeyCertOptions randomKeyCertOptions() {
-    KeyCertOptions keyCertOptions;
-    switch (TestUtils.randomPositiveInt() % 3) {
-      case 0:
-        keyCertOptions = new JksOptions();
-        String jksPassword = TestUtils.randomAlphaString(100);
-        ((JksOptions) keyCertOptions).setPassword(jksPassword);
-        break;
-      case 1:
-        keyCertOptions = new PemKeyCertOptions();
-        Buffer keyValue = TestUtils.randomBuffer(100);
-        ((PemKeyCertOptions) keyCertOptions).setKeyValue(keyValue);
-        break;
-      default:
-        keyCertOptions = new PfxOptions();
-        String pfxPassword = TestUtils.randomAlphaString(100);
-        ((PfxOptions) keyCertOptions).setPassword(pfxPassword);
-    }
-    return keyCertOptions;
-  }
-
-  private static TrustOptions randomTrustOptions() {
-    TrustOptions trustOptions;
-    switch (TestUtils.randomPositiveInt() % 3) {
-      case 0:
-        trustOptions = new JksOptions();
-        String tsPassword = TestUtils.randomAlphaString(100);
-        ((JksOptions) trustOptions).setPassword(tsPassword);
-        break;
-      case 1:
-        trustOptions = new PemTrustOptions();
-        Buffer keyValue = TestUtils.randomBuffer(100);
-        ((PemTrustOptions) trustOptions).addCertValue(keyValue);
-        break;
-      default:
-        trustOptions = new PfxOptions();
-        String pfxPassword = TestUtils.randomAlphaString(100);
-        ((PfxOptions) trustOptions).setPassword(pfxPassword);
-    }
-    return trustOptions;
-  }
-
   @Test
   public void testCopyClientOptions() {
     HttpClientOptions options = new HttpClientOptions();

diff --git a/src/test/java/io/vertx/test/core/TestUtils.java b/src/test/java/io/vertx/test/core/TestUtils.java
@@ -22,6 +22,7 @@
 import io.netty.handler.codec.http2.Http2CodecUtil;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.Http2Settings;
+import io.vertx.core.net.*;
 
 import java.io.ByteArrayOutputStream;
 import java.util.EnumSet;
@@ -320,4 +321,47 @@ public static byte[] compressGzip(String source) throws Exception {
     gos.close();
     return baos.toByteArray();
   }
+
+  public static KeyCertOptions randomKeyCertOptions() {
+    KeyCertOptions keyCertOptions;
+    switch (TestUtils.randomPositiveInt() % 3) {
+      case 0:
+        keyCertOptions = new JksOptions();
+        String jksPassword = TestUtils.randomAlphaString(100);
+        ((JksOptions) keyCertOptions).setPassword(jksPassword);
+        break;
+      case 1:
+        keyCertOptions = new PemKeyCertOptions();
+        Buffer keyValue = TestUtils.randomBuffer(100);
+        ((PemKeyCertOptions) keyCertOptions).setKeyValue(keyValue);
+        break;
+      default:
+        keyCertOptions = new PfxOptions();
+        String pfxPassword = TestUtils.randomAlphaString(100);
+        ((PfxOptions) keyCertOptions).setPassword(pfxPassword);
+    }
+    return keyCertOptions;
+  }
+
+  public static TrustOptions randomTrustOptions() {
+    TrustOptions trustOptions;
+    switch (TestUtils.randomPositiveInt() % 3) {
+      case 0:
+        trustOptions = new JksOptions();
+        String tsPassword = TestUtils.randomAlphaString(100);
+        ((JksOptions) trustOptions).setPassword(tsPassword);
+        break;
+      case 1:
+        trustOptions = new PemTrustOptions();
+        Buffer keyValue = TestUtils.randomBuffer(100);
+        ((PemTrustOptions) trustOptions).addCertValue(keyValue);
+        break;
+      default:
+        trustOptions = new PfxOptions();
+        String pfxPassword = TestUtils.randomAlphaString(100);
+        ((PfxOptions) trustOptions).setPassword(pfxPassword);
+    }
+    return trustOptions;
+  }
+
 }