diff --git a/core/sandbox/README.md b/core/sandbox/README.md index e9ff667fa2..c34c223078 100644 --- a/core/sandbox/README.md +++ b/core/sandbox/README.md @@ -11,7 +11,7 @@ This code was written by Ben Evans. # Roadmap -* Thorough code and security review. +* Thorough testing, code and security review. * Possibly, a conversion to Kotlin. * Make the instrumentation ahead of time only. * Finalise the chosen subset of the Java platform to expose to contract code. diff --git a/core/sandbox/src/main/java/com/r3cev/CandidacyStatus.java b/core/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java similarity index 97% rename from core/sandbox/src/main/java/com/r3cev/CandidacyStatus.java rename to core/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java index dd91daea63..9684dc2f08 100644 --- a/core/sandbox/src/main/java/com/r3cev/CandidacyStatus.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java @@ -1,4 +1,4 @@ -package com.r3cev; +package net.corda.sandbox; import java.util.*; @@ -8,7 +8,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import static com.r3cev.CandidateMethod.State.*; +import static net.corda.sandbox.CandidateMethod.State.*; /** * Represents the status of the candidacy of a particular set of candidate methods, i.e. Their progress from @@ -172,7 +172,7 @@ public class CandidacyStatus { final Set out = new HashSet<>(); for (final String candidateName : candidateMethods.keySet()) { final CandidateMethod candidate = candidateMethods.get(candidateName); - if (candidate.getCurrentState() == DISALLOWED) { + if (candidate.getCurrentState() == CandidateMethod.State.DISALLOWED) { out.add(candidateName); } } diff --git a/core/sandbox/src/main/java/com/r3cev/CandidateMethod.java b/core/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java similarity index 99% rename from core/sandbox/src/main/java/com/r3cev/CandidateMethod.java rename to core/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java index 9c4f2a697a..49e5091fbe 100644 --- a/core/sandbox/src/main/java/com/r3cev/CandidateMethod.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java @@ -1,4 +1,4 @@ -package com.r3cev; +package net.corda.sandbox; import java.lang.invoke.MethodType; import java.util.HashSet; diff --git a/core/sandbox/src/main/java/com/r3cev/SandboxAwareClassWriter.java b/core/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java similarity index 97% rename from core/sandbox/src/main/java/com/r3cev/SandboxAwareClassWriter.java rename to core/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java index ce037436db..03e3cf9d56 100644 --- a/core/sandbox/src/main/java/com/r3cev/SandboxAwareClassWriter.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java @@ -1,6 +1,6 @@ -package com.r3cev; +package net.corda.sandbox; -import static com.r3cev.Utils.*; +import static net.corda.sandbox.Utils.*; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; diff --git a/core/sandbox/src/main/java/com/r3cev/SandboxRemapper.java b/core/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java similarity index 93% rename from core/sandbox/src/main/java/com/r3cev/SandboxRemapper.java rename to core/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java index 8bdd87dace..2f55c4edb6 100644 --- a/core/sandbox/src/main/java/com/r3cev/SandboxRemapper.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java @@ -1,4 +1,4 @@ -package com.r3cev; +package net.corda.sandbox; import org.objectweb.asm.commons.Remapper; diff --git a/core/sandbox/src/main/java/com/r3cev/Utils.java b/core/sandbox/src/main/java/net/corda/sandbox/Utils.java similarity index 98% rename from core/sandbox/src/main/java/com/r3cev/Utils.java rename to core/sandbox/src/main/java/net/corda/sandbox/Utils.java index 0fd11a20b2..c185ba2500 100644 --- a/core/sandbox/src/main/java/com/r3cev/Utils.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/Utils.java @@ -1,6 +1,6 @@ -package com.r3cev; +package net.corda.sandbox; -import com.r3cev.visitors.CostInstrumentingMethodVisitor; +import net.corda.sandbox.visitors.CostInstrumentingMethodVisitor; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/core/sandbox/src/main/java/com/r3cev/WhitelistClassLoader.java b/core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java similarity index 98% rename from core/sandbox/src/main/java/com/r3cev/WhitelistClassLoader.java rename to core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java index 92a4daf182..9f363e3187 100644 --- a/core/sandbox/src/main/java/com/r3cev/WhitelistClassLoader.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java @@ -1,7 +1,7 @@ -package com.r3cev; +package net.corda.sandbox; -import com.r3cev.visitors.CostInstrumentingMethodVisitor; -import com.r3cev.visitors.WhitelistCheckingClassVisitor; +import net.corda.sandbox.visitors.CostInstrumentingMethodVisitor; +import net.corda.sandbox.visitors.WhitelistCheckingClassVisitor; import java.io.IOException; import java.io.InputStream; import java.net.URI; diff --git a/core/sandbox/src/main/java/com/r3cev/WhitelistClassloadingException.java b/core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java similarity index 96% rename from core/sandbox/src/main/java/com/r3cev/WhitelistClassloadingException.java rename to core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java index 194dc3af03..5f6c13ca9f 100644 --- a/core/sandbox/src/main/java/com/r3cev/WhitelistClassloadingException.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java @@ -1,4 +1,4 @@ -package com.r3cev; +package net.corda.sandbox; /** * diff --git a/core/sandbox/src/main/java/com/r3cev/costing/Contract.java b/core/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java similarity index 97% rename from core/sandbox/src/main/java/com/r3cev/costing/Contract.java rename to core/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java index 645206153a..ec098ecfbd 100644 --- a/core/sandbox/src/main/java/com/r3cev/costing/Contract.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java @@ -1,4 +1,4 @@ -package com.r3cev.costing; +package net.corda.sandbox.costing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/sandbox/src/main/java/com/r3cev/costing/ContractExecutor.java b/core/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java similarity index 94% rename from core/sandbox/src/main/java/com/r3cev/costing/ContractExecutor.java rename to core/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java index effeffce9c..243a3ddf11 100644 --- a/core/sandbox/src/main/java/com/r3cev/costing/ContractExecutor.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java @@ -1,4 +1,4 @@ -package com.r3cev.costing; +package net.corda.sandbox.costing; /** * This interface is to decouple the actual executable code from the entry point and diff --git a/core/sandbox/src/main/java/com/r3cev/costing/RuntimeCostAccounter.java b/core/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java similarity index 99% rename from core/sandbox/src/main/java/com/r3cev/costing/RuntimeCostAccounter.java rename to core/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java index 340aeffa41..f00c39defa 100644 --- a/core/sandbox/src/main/java/com/r3cev/costing/RuntimeCostAccounter.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java @@ -1,4 +1,4 @@ -package com.r3cev.costing; +package net.corda.sandbox.costing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/sandbox/src/main/java/com/r3cev/tools/SandboxCreator.java b/core/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java similarity index 96% rename from core/sandbox/src/main/java/com/r3cev/tools/SandboxCreator.java rename to core/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java index 23afd16561..add163fd26 100644 --- a/core/sandbox/src/main/java/com/r3cev/tools/SandboxCreator.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java @@ -1,13 +1,15 @@ -package com.r3cev.tools; +package net.corda.sandbox.tools; -import com.r3cev.WhitelistClassLoader; -import com.r3cev.visitors.SandboxPathVisitor; +import net.corda.sandbox.WhitelistClassLoader; +import net.corda.sandbox.visitors.SandboxPathVisitor; import java.io.FileInputStream; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.*; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; + +import net.corda.sandbox.visitors.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import joptsimple.OptionParser; diff --git a/core/sandbox/src/main/java/com/r3cev/visitors/CostInstrumentingMethodVisitor.java b/core/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java similarity index 97% rename from core/sandbox/src/main/java/com/r3cev/visitors/CostInstrumentingMethodVisitor.java rename to core/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java index 646e7122a2..5f7dc3fdea 100644 --- a/core/sandbox/src/main/java/com/r3cev/visitors/CostInstrumentingMethodVisitor.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java @@ -1,6 +1,6 @@ -package com.r3cev.visitors; +package net.corda.sandbox.visitors; -import com.r3cev.Utils; +import net.corda.sandbox.Utils; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; @@ -28,7 +28,7 @@ public final class CostInstrumentingMethodVisitor extends GeneratorAdapter { public CostInstrumentingMethodVisitor(MethodVisitor methodVisitor, int access, String name, String desc) { super(Opcodes.ASM5, methodVisitor, access, name, desc); - runtimeAccounterTypeName = "com/r3cev/costing/RuntimeCostAccounter"; + runtimeAccounterTypeName = "net/corda/sandbox/costing/RuntimeCostAccounter"; // save other calling parameters as well...? } diff --git a/core/sandbox/src/main/java/com/r3cev/visitors/DefinitelyDisallowedMethodVisitor.java b/core/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java similarity index 91% rename from core/sandbox/src/main/java/com/r3cev/visitors/DefinitelyDisallowedMethodVisitor.java rename to core/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java index 3cab317a86..62b882f269 100644 --- a/core/sandbox/src/main/java/com/r3cev/visitors/DefinitelyDisallowedMethodVisitor.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java @@ -1,4 +1,4 @@ -package com.r3cev.visitors; +package net.corda.sandbox.visitors; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/core/sandbox/src/main/java/com/r3cev/visitors/SandboxPathVisitor.java b/core/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java similarity index 93% rename from core/sandbox/src/main/java/com/r3cev/visitors/SandboxPathVisitor.java rename to core/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java index b885fa7796..bdc81bf995 100644 --- a/core/sandbox/src/main/java/com/r3cev/visitors/SandboxPathVisitor.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java @@ -1,7 +1,7 @@ -package com.r3cev.visitors; +package net.corda.sandbox.visitors; -import com.r3cev.Utils; -import com.r3cev.WhitelistClassLoader; +import net.corda.sandbox.Utils; +import net.corda.sandbox.WhitelistClassLoader; import java.nio.file.*; import java.nio.file.attribute.BasicFileAttributes; import org.slf4j.Logger; diff --git a/core/sandbox/src/main/java/com/r3cev/visitors/WhitelistCheckingClassVisitor.java b/core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java similarity index 92% rename from core/sandbox/src/main/java/com/r3cev/visitors/WhitelistCheckingClassVisitor.java rename to core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java index 811ececc0e..1c5159dcff 100644 --- a/core/sandbox/src/main/java/com/r3cev/visitors/WhitelistCheckingClassVisitor.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java @@ -1,19 +1,21 @@ -package com.r3cev.visitors; +package net.corda.sandbox.visitors; -import com.r3cev.WhitelistClassLoader; -import com.r3cev.CandidacyStatus; +import net.corda.sandbox.WhitelistClassLoader; +import net.corda.sandbox.CandidacyStatus; import java.util.Arrays; -import com.r3cev.CandidateMethod; -import com.r3cev.Utils; +import net.corda.sandbox.CandidateMethod; +import net.corda.sandbox.Utils; import java.util.HashSet; import java.util.Set; + +import net.corda.sandbox.*; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.r3cev.CandidateMethod.State.*; +import static net.corda.sandbox.CandidateMethod.State.*; import static org.objectweb.asm.Opcodes.*; /** @@ -39,14 +41,14 @@ public final class WhitelistCheckingClassVisitor extends ClassVisitor { super.visit(version, access, name, signature, superName, interfaces); currentClassName = name; - if (resolveState(Utils.convertInternalFormToQualifiedClassName(superName)) == DISALLOWED) { + if (resolveState(Utils.convertInternalFormToQualifiedClassName(superName)) == CandidateMethod.State.DISALLOWED) { candidacyStatus.setLoadable(false); candidacyStatus.setReason("Superclass " + superName + " could not be loaded"); return; } for (final String interfaceName : interfaces) { - if (resolveState(Utils.convertInternalFormToQualifiedClassName(interfaceName)) == DISALLOWED) { + if (resolveState(Utils.convertInternalFormToQualifiedClassName(interfaceName)) == CandidateMethod.State.DISALLOWED) { candidacyStatus.setLoadable(false); candidacyStatus.setReason("Interface " + interfaceName + " could not be loaded"); return; @@ -137,7 +139,7 @@ public final class WhitelistCheckingClassVisitor extends ClassVisitor { final String toLoadQualified = Utils.convertInternalMethodNameToQualifiedClassName(internalName); if (!Utils.shouldAttemptToTransitivelyLoad(toLoadQualified) - || resolveState(toLoadQualified) == DISALLOWED) { + || resolveState(toLoadQualified) == CandidateMethod.State.DISALLOWED) { referred.disallowed(internalName + " is DISALLOWED"); candidacyStatus.setLoadable(false); candidacyStatus.setReason(candidateMethod.getReason()); @@ -169,14 +171,14 @@ public final class WhitelistCheckingClassVisitor extends ClassVisitor { clz = loader.loadClass(qualifiedClassname); candidacyStatus.decRecursiveCount(); } catch (ClassNotFoundException ex) { - return DISALLOWED; + return CandidateMethod.State.DISALLOWED; } if (clz == null) { LOGGER.error("Couldn't load: " + qualifiedClassname); - return DISALLOWED; + return CandidateMethod.State.DISALLOWED; } - return DETERMINISTIC; + return CandidateMethod.State.DETERMINISTIC; } public CandidacyStatus getCandidacyStatus() { diff --git a/core/sandbox/src/main/java/com/r3cev/visitors/WhitelistCheckingMethodVisitor.java b/core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java similarity index 91% rename from core/sandbox/src/main/java/com/r3cev/visitors/WhitelistCheckingMethodVisitor.java rename to core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java index ca8aa10a9c..2fd52fa7e2 100644 --- a/core/sandbox/src/main/java/com/r3cev/visitors/WhitelistCheckingMethodVisitor.java +++ b/core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java @@ -1,14 +1,15 @@ -package com.r3cev.visitors; +package net.corda.sandbox.visitors; -import com.r3cev.CandidacyStatus; -import com.r3cev.CandidateMethod; +import net.corda.sandbox.CandidacyStatus; +import net.corda.sandbox.CandidateMethod; +import net.corda.sandbox.*; import org.objectweb.asm.Handle; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.r3cev.CandidateMethod.State.*; -import com.r3cev.Utils; +import static net.corda.sandbox.CandidateMethod.State.*; +import net.corda.sandbox.Utils; import org.objectweb.asm.Label; /** @@ -135,12 +136,12 @@ final class WhitelistCheckingMethodVisitor extends MethodVisitor { @Override public void visitEnd() { // Start from the assumption that the method is deterministic, and try to disprove - CandidateMethod.State checkState = DETERMINISTIC; + CandidateMethod.State checkState = CandidateMethod.State.DETERMINISTIC; final CandidateMethod candidateMethod = candidacyStatus.getCandidateMethod(currentMethodName); if (candidateMethod == null) { throw new IllegalArgumentException(currentMethodName + " not found in CandidacyStatus"); } - if (candidateMethod.getCurrentState() == DISALLOWED) { + if (candidateMethod.getCurrentState() == CandidateMethod.State.DISALLOWED) { return; } @@ -151,13 +152,13 @@ final class WhitelistCheckingMethodVisitor extends MethodVisitor { case DETERMINISTIC: break; case MENTIONED: - checkState = MENTIONED; + checkState = CandidateMethod.State.MENTIONED; break; case DISALLOWED: - checkState = DISALLOWED; + checkState = CandidateMethod.State.DISALLOWED; break CHECK; case SCANNED: - checkState = MENTIONED; + checkState = CandidateMethod.State.MENTIONED; if (referredMethod != candidateMethod) throw new IllegalStateException("Illegal state of method " + referredMethod.getInternalMethodName() + " occurred when visiting method " + currentMethodName); break; @@ -168,7 +169,7 @@ final class WhitelistCheckingMethodVisitor extends MethodVisitor { candidateMethod.setCurrentState(checkState); // If this methods state hasn't already been determined, it should be set to SCANNED - if (candidateMethod.getCurrentState() == MENTIONED) + if (candidateMethod.getCurrentState() == CandidateMethod.State.MENTIONED) candidateMethod.scanned(); } } diff --git a/core/sandbox/src/main/java/sandbox/com/r3cev/costing/RuntimeCostAccounter.java b/core/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java similarity index 57% rename from core/sandbox/src/main/java/sandbox/com/r3cev/costing/RuntimeCostAccounter.java rename to core/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java index f60ded00e6..7acc1f445d 100644 --- a/core/sandbox/src/main/java/sandbox/com/r3cev/costing/RuntimeCostAccounter.java +++ b/core/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java @@ -1,4 +1,4 @@ -package sandbox.com.r3cev.costing; +package sandbox.net.corda.sandbox.costing; /** * A helper class that just forwards any static sandboxed calls to the real runtime @@ -10,23 +10,23 @@ package sandbox.com.r3cev.costing; public class RuntimeCostAccounter { public static void recordJump() { - com.r3cev.costing.RuntimeCostAccounter.recordJump(); + net.corda.sandbox.costing.RuntimeCostAccounter.recordJump(); } public static void recordAllocation(final String typeName) { - com.r3cev.costing.RuntimeCostAccounter.recordAllocation(typeName); + net.corda.sandbox.costing.RuntimeCostAccounter.recordAllocation(typeName); } public static void recordArrayAllocation(final int length, final int multiplier) { - com.r3cev.costing.RuntimeCostAccounter.recordArrayAllocation(length, multiplier); + net.corda.sandbox.costing.RuntimeCostAccounter.recordArrayAllocation(length, multiplier); } public static void recordMethodCall() { - com.r3cev.costing.RuntimeCostAccounter.recordMethodCall(); + net.corda.sandbox.costing.RuntimeCostAccounter.recordMethodCall(); } public static void recordThrow() { - com.r3cev.costing.RuntimeCostAccounter.recordThrow(); + net.corda.sandbox.costing.RuntimeCostAccounter.recordThrow(); } } diff --git a/core/sandbox/src/test/java/com/r3cev/CandidateMethodTest.java b/core/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java similarity index 95% rename from core/sandbox/src/test/java/com/r3cev/CandidateMethodTest.java rename to core/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java index da0f10a7b5..0f63c67e9c 100644 --- a/core/sandbox/src/test/java/com/r3cev/CandidateMethodTest.java +++ b/core/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java @@ -1,6 +1,6 @@ -package com.r3cev; +package net.corda.sandbox; -import com.r3cev.CandidateMethod; +import net.corda.sandbox.CandidateMethod; import org.junit.Test; import org.slf4j.LoggerFactory; diff --git a/core/sandbox/src/test/java/com/r3cev/Constants.java b/core/sandbox/src/test/java/net/corda/sandbox/Constants.java similarity index 95% rename from core/sandbox/src/test/java/com/r3cev/Constants.java rename to core/sandbox/src/test/java/net/corda/sandbox/Constants.java index f05ebf9c1d..9c2ae06b4e 100644 --- a/core/sandbox/src/test/java/com/r3cev/Constants.java +++ b/core/sandbox/src/test/java/net/corda/sandbox/Constants.java @@ -1,4 +1,4 @@ -package com.r3cev; +package net.corda.sandbox; class Constants { public final static String INVALID_CLASS = "foobar"; diff --git a/core/sandbox/src/test/java/com/r3cev/TestUtils.java b/core/sandbox/src/test/java/net/corda/sandbox/TestUtils.java similarity index 95% rename from core/sandbox/src/test/java/com/r3cev/TestUtils.java rename to core/sandbox/src/test/java/net/corda/sandbox/TestUtils.java index 029c1533e8..dd4789f2f5 100644 --- a/core/sandbox/src/test/java/com/r3cev/TestUtils.java +++ b/core/sandbox/src/test/java/net/corda/sandbox/TestUtils.java @@ -1,6 +1,9 @@ -package com.r3cev; +package net.corda.sandbox; + +import net.corda.sandbox.costing.RuntimeCostAccounter; +import net.corda.sandbox.costing.*; +import org.junit.*; -import com.r3cev.costing.RuntimeCostAccounter; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; @@ -45,7 +48,7 @@ public class TestUtils { } public static void checkAllCosts(final int allocCost, final int jumpCost, final int invokeCost, final int throwCost) { - assertEquals(allocCost, RuntimeCostAccounter.getAllocationCost()); + Assert.assertEquals(allocCost, RuntimeCostAccounter.getAllocationCost()); assertEquals(jumpCost, RuntimeCostAccounter.getJumpCost()); assertEquals(invokeCost, RuntimeCostAccounter.getInvokeCost()); assertEquals(throwCost, RuntimeCostAccounter.getThrowCost()); diff --git a/core/sandbox/src/test/java/com/r3cev/WhitelistClassLoaderTest.java b/core/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java similarity index 99% rename from core/sandbox/src/test/java/com/r3cev/WhitelistClassLoaderTest.java rename to core/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java index 1dce78d577..3c427527c6 100644 --- a/core/sandbox/src/test/java/com/r3cev/WhitelistClassLoaderTest.java +++ b/core/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java @@ -1,4 +1,4 @@ -package com.r3cev; +package net.corda.sandbox; import static org.junit.Assert.*; import org.junit.Test; diff --git a/core/sandbox/src/test/java/com/r3cev/costing/DeterministicClassInstrumenterTest.java b/core/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java similarity index 95% rename from core/sandbox/src/test/java/com/r3cev/costing/DeterministicClassInstrumenterTest.java rename to core/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java index b54c643b2c..0b190ccb51 100644 --- a/core/sandbox/src/test/java/com/r3cev/costing/DeterministicClassInstrumenterTest.java +++ b/core/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java @@ -1,7 +1,7 @@ -package com.r3cev.costing; +package net.corda.sandbox.costing; -import com.r3cev.TestUtils; -import com.r3cev.WhitelistClassLoader; +import net.corda.sandbox.TestUtils; +import net.corda.sandbox.WhitelistClassLoader; import java.io.IOException; import java.lang.reflect.Method; import java.net.URISyntaxException; diff --git a/core/sandbox/src/test/java/com/r3cev/costing/SandboxedRewritingTest.java b/core/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java similarity index 97% rename from core/sandbox/src/test/java/com/r3cev/costing/SandboxedRewritingTest.java rename to core/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java index f81cacbc28..15bd7dafe2 100644 --- a/core/sandbox/src/test/java/com/r3cev/costing/SandboxedRewritingTest.java +++ b/core/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java @@ -1,8 +1,8 @@ -package com.r3cev.costing; +package net.corda.sandbox.costing; -import com.r3cev.TestUtils; -import static com.r3cev.TestUtils.*; -import com.r3cev.Utils; +import net.corda.sandbox.TestUtils; +import static net.corda.sandbox.TestUtils.*; +import net.corda.sandbox.Utils; import java.io.IOException; import java.lang.reflect.Method; import java.net.URISyntaxException;