You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2013/11/27 18:08:50 UTC
svn commit: r1546116 - in /santuario/xml-security-java/trunk: pom.xml
src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java
Author: coheigea
Date: Wed Nov 27 17:08:50 2013
New Revision: 1546116
URL: http://svn.apache.org/r1546116
Log:
Making the tests run in the right order with JDK 1.7
Modified:
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1546116&r1=1546115&r2=1546116&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Wed Nov 27 17:08:50 2013
@@ -417,7 +417,7 @@
<slf4j.version>1.7.5</slf4j.version>
<xalan.version>2.7.1</xalan.version>
<xerces.version>2.11.0</xerces.version>
- <junit.version>4.8.2</junit.version>
+ <junit.version>4.11</junit.version>
<log4j.version>1.2.17</log4j.version>
<bcprov.version>1.47</bcprov.version>
<xmlunit.version>1.4</xmlunit.version>
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java?rev=1546116&r1=1546115&r2=1546116&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java Wed Nov 27 17:08:50 2013
@@ -18,7 +18,9 @@
*/
package org.apache.xml.security.test.stax.performance;
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runners.MethodSorters;
import java.io.File;
import java.io.FileWriter;
@@ -28,6 +30,7 @@ import java.util.*;
* @author $Author: $
* @version $Revision: $ $Date: $
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class PerformanceMemoryTest extends AbstractPerformanceTest {
private static final int runs = 40;
@@ -44,7 +47,7 @@ public class PerformanceMemoryTest exten
}
@Test
- public void testOutboundSignatureMemoryPerformance() throws Exception {
+ public void testRunFirstOutboundSignatureMemoryPerformance() throws Exception {
System.out.println("Testing Outbound Signature Memory Performance");
FileWriter outSignatureSamplesWriter = new FileWriter("target/signatureOutMemorySamples.txt", false);
for (int i = 1; i <= runs; i++) {
@@ -82,7 +85,7 @@ public class PerformanceMemoryTest exten
}
@Test
- public void testInboundSignatureMemoryPerformance() throws Exception {
+ public void testRunSecondInboundSignatureMemoryPerformance() throws Exception {
System.out.println("Testing Inbound Signature Memory Performance");
FileWriter inSignatureSamplesWriter = new FileWriter("target/signatureInMemorySamples.txt", false);
@@ -122,7 +125,7 @@ public class PerformanceMemoryTest exten
}
@Test
- public void testOutboundEncryptionMemoryPerformance() throws Exception {
+ public void testRunFirstOutboundEncryptionMemoryPerformance() throws Exception {
System.out.println("Testing Outbound Encryption Memory Performance");
FileWriter outEncryptionSamplesWriter = new FileWriter("target/encryptionOutMemorySamples.txt", false);
for (int i = 1; i <= runs; i++) {
@@ -160,7 +163,7 @@ public class PerformanceMemoryTest exten
}
@Test
- public void testInboundDecryptionMemoryPerformance() throws Exception {
+ public void testRunSecondInboundDecryptionMemoryPerformance() throws Exception {
System.out.println("Testing Inbound Decryption Memory Performance");
FileWriter inEncryptionSamplesWriter = new FileWriter("target/encryptionInMemorySamples.txt", false);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java?rev=1546116&r1=1546115&r2=1546116&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java Wed Nov 27 17:08:50 2013
@@ -18,7 +18,9 @@
*/
package org.apache.xml.security.test.stax.performance;
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runners.MethodSorters;
import java.io.File;
import java.io.FileWriter;
@@ -30,6 +32,7 @@ import java.util.TreeMap;
* @author $Author: $
* @version $Revision: $ $Date: $
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class PerformanceTimingTest extends AbstractPerformanceTest {
private static final int runs = 40;
@@ -45,7 +48,7 @@ public class PerformanceTimingTest exten
}
@Test
- public void testOutboundSignatureTimePerformance() throws Exception {
+ public void testRunFirstOutboundSignatureTimePerformance() throws Exception {
System.out.println("Testing Outbound Signature Time Performance");
FileWriter outSignatureSamplesWriter = new FileWriter("target/signatureOutTimeSamples.txt", false);
for (int i = 1; i <= runs; i++) {
@@ -73,7 +76,7 @@ public class PerformanceTimingTest exten
}
@Test
- public void testInboundSignatureTimePerformance() throws Exception {
+ public void testRunSecondInboundSignatureTimePerformance() throws Exception {
System.out.println("Testing Inbound Signature Time Performance");
FileWriter inSignatureSamplesWriter = new FileWriter("target/signatureInTimeSamples.txt", false);
@@ -103,7 +106,7 @@ public class PerformanceTimingTest exten
}
@Test
- public void testOutboundEncryptionTimePerformance() throws Exception {
+ public void testRunFirstOutboundEncryptionTimePerformance() throws Exception {
System.out.println("Testing Outbound Encryption Time Performance");
FileWriter outEncryptionSamplesWriter = new FileWriter("target/encryptionOutTimeSamples.txt", false);
for (int i = 1; i <= runs; i++) {
@@ -131,7 +134,7 @@ public class PerformanceTimingTest exten
}
@Test
- public void testInboundDecryptionTimePerformance() throws Exception {
+ public void testRunSecondInboundDecryptionTimePerformance() throws Exception {
System.out.println("Testing Inbound Decryption Time Performance");
FileWriter inEncryptionSamplesWriter = new FileWriter("target/encryptionInTimeSamples.txt", false);