Merge upstream-master into master.

am: 13b268f049

Change-Id: I87bfaacebb9d4c90d986bcfc4f75d3af87de29e1

1 files changed, 53 insertions, 0 deletions

diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java
new file mode 100644
index 0000000..47a4dcf
--- /dev/null
+++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.security.wycheproof;
+
+import com.google.security.wycheproof.WycheproofRunner.Provider;
+import com.google.security.wycheproof.WycheproofRunner.ProviderType;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * BouncyCastleAllTests runs all tests.
+ */
+@RunWith(WycheproofRunner.class)
+@SuiteClasses({
+  AesEaxTest.class,
+  AesGcmTest.class,
+  BasicTest.class,
+  CipherInputStreamTest.class,
+  CipherOutputStreamTest.class,
+  DhTest.class,
+  DhiesTest.class,
+  DsaTest.class,
+  EcKeyTest.class,
+  EcdhTest.class,
+  EcdsaTest.class,
+  EciesTest.class,
+  RsaEncryptionTest.class,
+  RsaKeyTest.class,
+  RsaSignatureTest.class,
+})
+@Provider(ProviderType.BOUNCY_CASTLE)
+public final class BouncyCastleAllTests {
+  @BeforeClass
+  public static void setUp() throws Exception {
+    TestUtil.installOnlyThisProvider(new BouncyCastleProvider());
+  }
+}