harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r950461 - /harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Date Wed, 02 Jun 2010 09:49:25 GMT
Author: odeakin
Date: Wed Jun  2 09:49:25 2010
New Revision: 950461

URL: http://svn.apache.org/viewvc?rev=950461&view=rev
Log:
Fix paths for instrument tests as they are now run out of the HDK.

Modified:
    harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java

Modified: harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java?rev=950461&r1=950460&r2=950461&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Wed Jun  2 09:49:25 2010
@@ -28,10 +28,10 @@ public class InstrumentTest extends Test
      */
     public void test_addTransformer_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -41,10 +41,10 @@ public class InstrumentTest extends Test
      */
     public void test_removeTransformer_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -54,10 +54,10 @@ public class InstrumentTest extends Test
      */
     public void test_removeTransformer_notExists() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -67,10 +67,10 @@ public class InstrumentTest extends Test
      */
     public void test_loadClass_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -85,10 +85,10 @@ public class InstrumentTest extends Test
      */
     public void test_new_classLoader_Exists() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertNotNull(result);
     }
@@ -98,10 +98,10 @@ public class InstrumentTest extends Test
      */
     public void test_Property_Premain_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -120,10 +120,10 @@ public class InstrumentTest extends Test
      */
     public void test_Property_other_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertNotNull(result);
     }
@@ -133,10 +133,10 @@ public class InstrumentTest extends Test
      */
     public void test_Properity_case_sensitive() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -146,10 +146,10 @@ public class InstrumentTest extends Test
      */
     public void test_BadFormatJar() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
         arg[1] = "";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -167,10 +167,10 @@ public class InstrumentTest extends Test
      */
     public void test_Premain_Class_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -185,10 +185,10 @@ public class InstrumentTest extends Test
      */
     public void test_zero_byte_transformer() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -198,10 +198,10 @@ public class InstrumentTest extends Test
      */
     public void test_old_version() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }



Mime
View raw message