Refactor CallTest

Author: sink772

unittest/src/test/java/score/CallTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022 ICONLOOP Inc.
+ *
+ * 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 score;
+
+import com.iconloop.score.test.Account;
+import com.iconloop.score.test.Score;
+import com.iconloop.score.test.ServiceManager;
+import com.iconloop.score.test.TestBase;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import score.annotation.External;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CallTest extends TestBase {
+    private static final ServiceManager sm = getServiceManager();
+    private static final Account owner = sm.createAccount();
+    private static Score echoScore;
+
+    public static class Echo {
+        @External(readonly=true)
+        public String echo(String message) {
+            return message;
+        }
+
+        @External(readonly=true)
+        public String castedEcho(String message) {
+            return (String) Context.call(Context.getAddress(), "echo", message);
+        }
+
+        @External(readonly=true)
+        public String typedEcho(String message) {
+            return Context.call(String.class, Context.getAddress(), "echo", message);
+        }
+    }
+
+    @BeforeAll
+    static void setUp() throws Exception {
+        echoScore = sm.deploy(owner, Echo.class);
+    }
+
+    @Test
+    void callCasted() {
+        String echoMessage = "test";
+        assertEquals(echoMessage, echoScore.call("castedEcho", echoMessage));
+    }
+
+    @Test
+    void callTyped() {
+        String echoMessage = "test";
+        assertEquals(echoMessage, echoScore.call("typedEcho", echoMessage));
+    }
+}

unittest/src/test/java/score/ContextTest.java

@@ -20,7 +20,7 @@
 import com.iconloop.score.test.Score;
 import com.iconloop.score.test.ServiceManager;
 import com.iconloop.score.test.TestBase;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import score.impl.Crypto;
 
@@ -32,10 +32,9 @@ class ContextTest extends TestBase {
     private static final Account owner = sm.createAccount();
     private static Score helloScore;
 
-    @BeforeEach
-    void setUp() throws Exception {
-        Score echoScore = sm.deploy(owner, Echo.class);
-        helloScore = sm.deploy(owner, HelloWorld.class, "Alice", echoScore.getAddress());
+    @BeforeAll
+    static void setUp() throws Exception {
+        helloScore = sm.deploy(owner, HelloWorld.class, "Alice");
     }
 
     @Test
@@ -65,16 +64,4 @@ void hash() {
                     (byte[]) helloScore.call("computeHash", algo, data));
         }
     }
-
-    @Test
-    void callCasted() {
-       String echoMessage = "test";
-       assertEquals(echoMessage, helloScore.call("castedEcho", echoMessage));
-    }
-
-    @Test
-    void callTyped() {
-        String echoMessage = "test";
-       assertEquals(echoMessage, helloScore.call("typedEcho", echoMessage));
-    }
 }

unittest/src/test/java/score/Echo.java

@@ -20,11 +20,9 @@
 
 public class HelloWorld {
     private final String name;
-    private final Address echoAddress;
 
-    public HelloWorld(String name, Address echoAddress) {
+    public HelloWorld(String name) {
         this.name = name;
-        this.echoAddress = echoAddress;
     }
 
     @External(readonly=true)
@@ -51,14 +49,4 @@ public long getBlockTimestamp() {
     public byte[] computeHash(String algorithm, byte[] data) {
         return Context.hash(algorithm, data);
     }
-
-    @External(readonly=true)
-    public String castedEcho(String message) {
-        return (String) Context.call(echoAddress, "echo", message);
-    }
-
-    @External(readonly=true)
-    public String typedEcho(String message) {
-        return Context.call(String.class, echoAddress, "echo", message);
-    }
 }