You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2014/07/27 11:41:25 UTC
svn commit: r1613767 - in /axis/axis2/java/rampart/branches/1_6: ./ apidocs/
modules/distribution/ modules/rampart-samples/
modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
Author: veithen
Date: Sun Jul 27 09:41:25 2014
New Revision: 1613767
URL: http://svn.apache.org/r1613767
Log:
Merged r1612072 and r1612138 to the 1.6 branch to have a clean working copy.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/apidocs/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/distribution/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 27 09:41:25 2014
@@ -1 +1,3 @@
+.project
+.settings
target
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/rampart/trunk:r1612072,1612138
Propchange: axis/axis2/java/rampart/branches/1_6/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 27 09:41:25 2014
@@ -1 +1,3 @@
+.project
+.settings
target
Propchange: axis/axis2/java/rampart/branches/1_6/modules/distribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 27 09:41:25 2014
@@ -1 +1,3 @@
+.project
+.settings
target
Propchange: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 27 09:41:25 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java?rev=1613767&r1=1613766&r2=1613767&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java Sun Jul 27 09:41:25 2014
@@ -24,9 +24,8 @@ import org.apache.axiom.om.impl.dom.DOOM
import junit.framework.TestCase;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Date;
@@ -157,7 +156,6 @@ public class SimpleTokenStoreTest extend
public void testSerialize()
throws Exception {
- String fileName = "test.ser";
OMFactory factory = OMAbstractFactory.getOMFactory();
OMNamespace ns1 = factory.createOMNamespace("bar", "x");
@@ -168,30 +166,13 @@ public class SimpleTokenStoreTest extend
SimpleTokenStore store = new SimpleTokenStore();
store.add(t);
- FileOutputStream fos = null;
- ObjectOutputStream out = null;
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(baos);
- try {
- fos = new FileOutputStream(fileName);
- out = new ObjectOutputStream(fos);
- out.writeObject(store);
- } finally {
- out.close();
- }
-
- SimpleTokenStore store2 = null;
- FileInputStream fis = null;
- ObjectInputStream in = null;
- try {
- fis = new FileInputStream(fileName);
- in = new ObjectInputStream(fis);
- store2 = (SimpleTokenStore)in.readObject();
- in.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- } catch (ClassNotFoundException ex) {
- ex.printStackTrace();
- }
+ out.writeObject(store);
+
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+ SimpleTokenStore store2 = (SimpleTokenStore)in.readObject();
assertEquals(store.getToken("#1232122").getId(), store2.getToken("#1232122").getId());
assertEquals(store.getToken("#1232122").getCreated(), store2.getToken("#1232122").getCreated());