You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/20 19:38:52 UTC
[commons-bcel] 01/02: Sort members
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit caa44067d2458909c542f22a2f07628e449c2b42
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Sun Nov 20 14:32:13 2022 -0500
Sort members
---
src/main/java/org/apache/bcel/generic/Type.java | 8 ++---
.../java/org/apache/bcel/HelloWorldCreator.java | 18 +++++-----
.../org/apache/bcel/util/BCELifierTestCase.java | 38 +++++++++++-----------
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/apache/bcel/generic/Type.java b/src/main/java/org/apache/bcel/generic/Type.java
index 9ff8110f..3d0fc745 100644
--- a/src/main/java/org/apache/bcel/generic/Type.java
+++ b/src/main/java/org/apache/bcel/generic/Type.java
@@ -119,10 +119,6 @@ public abstract class Type {
return res;
}
- public String getClassName() {
- return toString();
- }
-
/**
* Convert type to Java method signature, e.g. int[] f(java.lang.String x) becomes (Ljava/lang/String;)[I
*
@@ -327,6 +323,10 @@ public abstract class Type {
return false;
}
+ public String getClassName() {
+ return toString();
+ }
+
/**
* @return signature for given type.
*/
diff --git a/src/test/java/org/apache/bcel/HelloWorldCreator.java b/src/test/java/org/apache/bcel/HelloWorldCreator.java
index 678369a6..53642e4a 100644
--- a/src/test/java/org/apache/bcel/HelloWorldCreator.java
+++ b/src/test/java/org/apache/bcel/HelloWorldCreator.java
@@ -33,8 +33,17 @@ import java.nio.file.Paths;
public class HelloWorldCreator {
private static final String ORG_APACHE_BCEL_HELLO_WORLD = "org.apache.bcel.HelloWorld";
+ public static void main(String[] args) throws Exception {
+ org.apache.bcel.HelloWorldCreator creator = new org.apache.bcel.HelloWorldCreator();
+ Path path = Paths.get("target/test-classes/org/apache/bcel/HelloWorld.class");
+ Files.deleteIfExists(path);
+ try (OutputStream out = Files.newOutputStream(path)) {
+ creator.create(out);
+ }
+ }
private InstructionFactory factory;
private ConstantPoolGen cp;
+
private ClassGen cg;
public HelloWorldCreator() {
@@ -76,13 +85,4 @@ public class HelloWorldCreator {
cg.addMethod(method.getMethod());
il.dispose();
}
-
- public static void main(String[] args) throws Exception {
- org.apache.bcel.HelloWorldCreator creator = new org.apache.bcel.HelloWorldCreator();
- Path path = Paths.get("target/test-classes/org/apache/bcel/HelloWorld.class");
- Files.deleteIfExists(path);
- try (OutputStream out = Files.newOutputStream(path)) {
- creator.create(out);
- }
- }
}
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index 0d3345a5..3779e481 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -98,6 +98,19 @@ public class BCELifierTestCase extends AbstractTestCase {
assertEquals(canonHashRef(initial), canonHashRef(output));
}
+ @Test
+ public void testHelloWorld() throws Exception {
+ HelloWorldCreator.main(new String[] {});
+ final File workDir = new File("target");
+ final String javaAgent = getJavaAgent();
+ if (javaAgent == null) {
+ assertEquals("Hello World!" + EOL, exec(workDir, "java", "-cp", CLASSPATH, "org.apache.bcel.HelloWorld"));
+ } else {
+ String runtimeExecJavaAgent = javaAgent.replace("jacoco.exec", "jacoco_org.apache.bcel.HelloWorld.exec");
+ assertEquals("Hello World!" + EOL, exec(workDir, "java", runtimeExecJavaAgent, "-cp", CLASSPATH, "org.apache.bcel.HelloWorld"));
+ }
+ }
+
/*
* Dump a class using "javap" and compare with the same class recreated using BCELifier, "javac", "java" and dumped with
* "javap" TODO: detect if JDK present and skip test if not
@@ -120,15 +133,6 @@ public class BCELifierTestCase extends AbstractTestCase {
testClassOnPath(pathToClass);
}
- @Test
- public void testStart() throws Exception {
- final OutputStream os = new ByteArrayOutputStream();
- final JavaClass javaClass = BCELifier.getJavaClass("Java8Example");
- assertNotNull(javaClass);
- final BCELifier bcelifier = new BCELifier(javaClass, os);
- bcelifier.start();
- }
-
@Test
public void testMainNoArg() throws Exception {
final PrintStream sysout = System.out;
@@ -144,15 +148,11 @@ public class BCELifierTestCase extends AbstractTestCase {
}
@Test
- public void testHelloWorld() throws Exception {
- HelloWorldCreator.main(new String[] {});
- final File workDir = new File("target");
- final String javaAgent = getJavaAgent();
- if (javaAgent == null) {
- assertEquals("Hello World!" + EOL, exec(workDir, "java", "-cp", CLASSPATH, "org.apache.bcel.HelloWorld"));
- } else {
- String runtimeExecJavaAgent = javaAgent.replace("jacoco.exec", "jacoco_org.apache.bcel.HelloWorld.exec");
- assertEquals("Hello World!" + EOL, exec(workDir, "java", runtimeExecJavaAgent, "-cp", CLASSPATH, "org.apache.bcel.HelloWorld"));
- }
+ public void testStart() throws Exception {
+ final OutputStream os = new ByteArrayOutputStream();
+ final JavaClass javaClass = BCELifier.getJavaClass("Java8Example");
+ assertNotNull(javaClass);
+ final BCELifier bcelifier = new BCELifier(javaClass, os);
+ bcelifier.start();
}
}