This is an automated email from the ASF dual-hosted git repository. shaojunwang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-java-tee-sdk.git
commit 52c5b75b3e7b03508713c8c9a50fb053637c6886 Author: shaojunwang <[email protected]> AuthorDate: Sat Nov 26 22:25:33 2022 +0800 Set pccs_url for remote attestation Add log for ut cases --- coverage/run.sh | 4 ++++ .../org/apache/teaclave/javasdk/test/host/TestEnclaveAES.java | 8 ++++++++ .../apache/teaclave/javasdk/test/host/TestEnclaveConcurrency.java | 8 ++++++++ .../apache/teaclave/javasdk/test/host/TestEnclaveException.java | 8 ++++++++ .../org/apache/teaclave/javasdk/test/host/TestEnclaveInfo.java | 8 ++++++++ .../apache/teaclave/javasdk/test/host/TestEnclaveInfoMXBean.java | 8 ++++++++ .../apache/teaclave/javasdk/test/host/TestEnclaveMetricTrace.java | 8 ++++++++ .../org/apache/teaclave/javasdk/test/host/TestEnclaveRSA.java | 8 ++++++++ .../apache/teaclave/javasdk/test/host/TestEnclaveReflection.java | 8 ++++++++ .../org/apache/teaclave/javasdk/test/host/TestEnclaveSHA.java | 8 ++++++++ .../apache/teaclave/javasdk/test/host/TestEnclaveServiceGC.java | 8 ++++++++ .../org/apache/teaclave/javasdk/test/host/TestHelloWorld.java | 8 ++++++++ .../main/java/org/apache/teaclave/javasdk/test/host/TestMain.java | 5 ++++- .../apache/teaclave/javasdk/test/host/TestRemoteAttestation.java | 8 ++++++++ .../java/org/apache/teaclave/javasdk/test/host/TestSMEnclave.java | 8 ++++++++ test/run.sh | 4 ++++ 16 files changed, 116 insertions(+), 1 deletion(-) diff --git a/coverage/run.sh b/coverage/run.sh index f656cc7..5680840 100755 --- a/coverage/run.sh +++ b/coverage/run.sh @@ -17,6 +17,10 @@ # specific language governing permissions and limitations # under the License. +# Setting PCCS_URL for SGX Remote Attestation. +echo "PCCS_URL=https://sgx-dcap-server.cn-beijing.aliyuncs.com/sgx/certification/v3/"; > /etc/sgx_default_qcnl.conf +echo "USE_SECURE_CERT=TRUE" >> /etc/sgx_default_qcnl.conf + TEST_PATH=$1 # Download jacoco agent from maven central repo. diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveAES.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveAES.java index 3f0b032..9c27772 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveAES.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveAES.java @@ -22,6 +22,8 @@ import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveType; import org.apache.teaclave.javasdk.test.common.AESSealedTest; import org.apache.teaclave.javasdk.test.common.AESService; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -29,6 +31,12 @@ import java.util.Iterator; import static org.junit.jupiter.api.Assertions.*; public class TestEnclaveAES { + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testAESService() throws Exception { String plaintext = "Hello World!!!"; diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveConcurrency.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveConcurrency.java index 8371d61..0506f16 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveConcurrency.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveConcurrency.java @@ -21,6 +21,8 @@ import org.apache.teaclave.javasdk.host.Enclave; import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveType; import org.apache.teaclave.javasdk.test.common.ConcurrencyCalculate; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -93,6 +95,12 @@ public class TestEnclaveConcurrency { enclave.destroy(); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testEnclaveConcurrency() throws Exception { enclaveConcurrency(EnclaveType.MOCK_IN_JVM); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveException.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveException.java index f17d72a..f53d046 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveException.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveException.java @@ -25,6 +25,8 @@ import org.apache.teaclave.javasdk.host.exception.EnclaveDestroyingException; import org.apache.teaclave.javasdk.host.exception.ServicesLoadingException; import org.apache.teaclave.javasdk.test.common.EnclaveException; import org.apache.teaclave.javasdk.test.common.JavaEnclaveException; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -44,6 +46,12 @@ public class TestEnclaveException { enclave.destroy(); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testJavaEnclaveException() throws Exception { javaEnclaveException(EnclaveType.MOCK_IN_JVM); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfo.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfo.java index ee529d5..722b8c4 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfo.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfo.java @@ -21,12 +21,20 @@ import org.apache.teaclave.javasdk.host.Enclave; import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveInfo; import org.apache.teaclave.javasdk.host.EnclaveType; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import static org.junit.jupiter.api.Assertions.*; public class TestEnclaveInfo { + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testEnclaveInfo() throws Exception { Enclave enclave = EnclaveFactory.create(EnclaveType.MOCK_IN_JVM); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfoMXBean.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfoMXBean.java index 220b004..0c1ab76 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfoMXBean.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveInfoMXBean.java @@ -18,6 +18,8 @@ package org.apache.teaclave.javasdk.test.host; import org.apache.teaclave.javasdk.host.*; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import javax.management.MBeanServer; @@ -104,6 +106,12 @@ public class TestEnclaveInfoMXBean { enclaveLIBOS.destroy(); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testEnclaveInfo() throws Exception { Thread serviceThread = new Thread(() -> { diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveMetricTrace.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveMetricTrace.java index 3c31642..2ae7793 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveMetricTrace.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveMetricTrace.java @@ -22,6 +22,8 @@ import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveType; import org.apache.teaclave.javasdk.host.MetricTrace; import org.apache.teaclave.javasdk.test.common.MetricTraceService; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.io.File; @@ -42,6 +44,12 @@ public class TestEnclaveMetricTrace { return new String(content); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testEnclaveMetricTrace() throws Exception { MetricTrace.setEnclaveMetricTraceSwitch(true); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveRSA.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveRSA.java index 3603ae3..487d669 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveRSA.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveRSA.java @@ -21,6 +21,8 @@ import org.apache.teaclave.javasdk.host.Enclave; import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveType; import org.apache.teaclave.javasdk.test.common.RSAService; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -29,6 +31,12 @@ import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEnclaveRSA { + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testRSAService() throws Exception { String plaintext = "Hello World!!!"; diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveReflection.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveReflection.java index c2d140a..d5b14d5 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveReflection.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveReflection.java @@ -24,6 +24,8 @@ import org.apache.teaclave.javasdk.host.exception.EnclaveCreatingException; import org.apache.teaclave.javasdk.host.exception.EnclaveDestroyingException; import org.apache.teaclave.javasdk.host.exception.ServicesLoadingException; import org.apache.teaclave.javasdk.test.common.ReflectionCallService; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -45,6 +47,12 @@ public class TestEnclaveReflection { enclave.destroy(); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testReflectionCallService() throws Exception { reflectionCallService(EnclaveType.MOCK_IN_JVM); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveSHA.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveSHA.java index 06226e9..4de078a 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveSHA.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveSHA.java @@ -21,6 +21,8 @@ import org.apache.teaclave.javasdk.host.Enclave; import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveType; import org.apache.teaclave.javasdk.test.common.SHAService; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.math.BigInteger; @@ -42,6 +44,12 @@ public class TestEnclaveSHA { return hashText.toString(); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testEnclaveSHA() throws Exception { String plaintext = "Hello World!!!"; diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveServiceGC.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveServiceGC.java index e5fe024..93a7f9a 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveServiceGC.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestEnclaveServiceGC.java @@ -21,6 +21,8 @@ import org.apache.teaclave.javasdk.host.Enclave; import org.apache.teaclave.javasdk.host.EnclaveFactory; import org.apache.teaclave.javasdk.host.EnclaveType; import org.apache.teaclave.javasdk.test.common.EnclaveServiceStatistic; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -46,6 +48,12 @@ public class TestEnclaveServiceGC { enclave.destroy(); } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testEnclaveServiceGC() throws Exception { enclaveServiceGC(EnclaveType.MOCK_IN_SVM); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestHelloWorld.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestHelloWorld.java index a084f66..1305e95 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestHelloWorld.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestHelloWorld.java @@ -24,6 +24,8 @@ import org.apache.teaclave.javasdk.host.exception.EnclaveCreatingException; import org.apache.teaclave.javasdk.host.exception.EnclaveDestroyingException; import org.apache.teaclave.javasdk.host.exception.ServicesLoadingException; import org.apache.teaclave.javasdk.test.common.SayHelloService; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -46,6 +48,12 @@ public class TestHelloWorld { return result; } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testSayHelloService() throws Exception { assertEquals("Hello World", sayHelloService(EnclaveType.MOCK_IN_JVM, "Hello World")); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestMain.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestMain.java index 008b006..706e335 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestMain.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestMain.java @@ -17,6 +17,7 @@ package org.apache.teaclave.javasdk.test.host; +import org.junit.internal.TextListener; import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.RunWith; @@ -45,7 +46,9 @@ class TestJavaEnclaveSuites { public class TestMain { public static void main(String[] args) { - Result result = JUnitCore.runClasses(TestJavaEnclaveSuites.class); + JUnitCore junit = new JUnitCore(); + junit.addListener(new TextListener(System.out)); + Result result = junit.run(TestJavaEnclaveSuites.class); for (Failure failure : result.getFailures()) { System.out.println(failure.toString()); } diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestRemoteAttestation.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestRemoteAttestation.java index 601412b..e4cf999 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestRemoteAttestation.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestRemoteAttestation.java @@ -21,6 +21,8 @@ import org.apache.teaclave.javasdk.host.*; import org.apache.teaclave.javasdk.host.exception.EnclaveCreatingException; import org.apache.teaclave.javasdk.host.exception.EnclaveDestroyingException; import org.apache.teaclave.javasdk.host.exception.RemoteAttestationException; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Random; @@ -51,6 +53,12 @@ public class TestRemoteAttestation { } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testRemoteAttestation() throws Exception { remoteAttestation(EnclaveType.TEE_SDK); diff --git a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestSMEnclave.java b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestSMEnclave.java index a867c65..18bc005 100644 --- a/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestSMEnclave.java +++ b/test/host/src/main/java/org/apache/teaclave/javasdk/test/host/TestSMEnclave.java @@ -26,6 +26,8 @@ import org.apache.teaclave.javasdk.test.common.SM4Service; import org.apache.teaclave.javasdk.test.common.SMSignAndVerify; import org.bouncycastle.crypto.Digest; import org.bouncycastle.crypto.digests.SM3Digest; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.util.Iterator; @@ -42,6 +44,12 @@ public class TestSMEnclave { return digest; } + @Before + public final void before() { System.out.println("enter test case: " + this.getClass().getName()); } + + @After + public final void after() { System.out.println("exit test case: " + this.getClass().getName()); } + @Test public void testSM2Enclave() throws Exception { String plaintext = "Hello World!!!"; diff --git a/test/run.sh b/test/run.sh index ac595e0..607b313 100755 --- a/test/run.sh +++ b/test/run.sh @@ -17,6 +17,10 @@ # specific language governing permissions and limitations # under the License. +# Setting PCCS_URL for SGX Remote Attestation. +echo "PCCS_URL=https://sgx-dcap-server.cn-beijing.aliyuncs.com/sgx/certification/v3/"; > /etc/sgx_default_qcnl.conf +echo "USE_SECURE_CERT=TRUE" >> /etc/sgx_default_qcnl.conf + # Compile test project. mvn -Pnative clean package --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
