Author: peter_firmstone Date: Sun Feb 19 03:05:33 2012 New Revision: 1290926
URL: http://svn.apache.org/viewvc?rev=1290926&view=rev Log: Incremental merge Added: river/jtsk/merge/test/lib/imunit-1.3.jar - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/lib/imunit-1.3.jar river/jtsk/merge/test/src/org/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/ river/jtsk/merge/test/src/org/apache/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/ river/jtsk/merge/test/src/org/apache/river/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/ river/jtsk/merge/test/src/org/apache/river/api/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/ river/jtsk/merge/test/src/org/apache/river/api/security/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ river/jtsk/merge/test/src/org/apache/river/api/security/CodeSourceGrantTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/CodeSourceGrantTest.java river/jtsk/merge/test/src/org/apache/river/api/security/ConcurrentPermissionsTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ConcurrentPermissionsTest.java river/jtsk/merge/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java river/jtsk/merge/test/src/org/apache/river/api/security/DefaultPolicyParserTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/DefaultPolicyParserTest.java river/jtsk/merge/test/src/org/apache/river/api/security/DelegateCombinerSecurityManagerTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/DelegateCombinerSecurityManagerTest.java river/jtsk/merge/test/src/org/apache/river/api/security/PermissionCollectionTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PermissionCollectionTest.java river/jtsk/merge/test/src/org/apache/river/api/security/PermissionGrantTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PermissionGrantTest.java river/jtsk/merge/test/src/org/apache/river/api/security/Permissions_ImplTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/Permissions_ImplTest.java river/jtsk/merge/test/src/org/apache/river/api/security/PolicyEntryTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PolicyEntryTest.java river/jtsk/merge/test/src/org/apache/river/api/security/PolicyUtilsTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PolicyUtilsTest.java river/jtsk/merge/test/src/org/apache/river/api/security/PrincipalGrantTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PrincipalGrantTest.java river/jtsk/merge/test/src/org/apache/river/api/security/SegmentTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/SegmentTest.java river/jtsk/merge/test/src/org/apache/river/api/security/policy/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/policy/ river/jtsk/merge/test/src/org/apache/river/impl/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/ river/jtsk/merge/test/src/org/apache/river/impl/security/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/ river/jtsk/merge/test/src/org/apache/river/impl/security/dos/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/dos/ river/jtsk/merge/test/src/org/apache/river/impl/security/dos/IsolateTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/dos/IsolateTest.java river/jtsk/merge/test/src/org/apache/river/impl/security/policy/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/policy/ river/jtsk/merge/test/src/org/apache/river/impl/security/policy/util/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/policy/util/ river/jtsk/merge/test/src/org/apache/river/impl/util/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceBlockingQueueConcurrencyTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceBlockingQueueConcurrencyTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceBlockingQueueTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceBlockingQueueTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceConcurrentMapConcurrencyTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentMapConcurrencyTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceConcurrentMapTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentMapTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMapTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMapTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceDequeTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceDequeTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceListTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceListTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceMapTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceMapTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceNavigableMapTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceNavigableMapTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceNavigableSetTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceNavigableSetTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceSetTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSetTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceSortedMapTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSortedMapTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceSortedSetTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSortedSetTest.java river/jtsk/merge/test/src/org/apache/river/impl/util/ReferencedQueueTest.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferencedQueueTest.java river/jtsk/merge/test/src/tests/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/ river/jtsk/merge/test/src/tests/support/ - copied from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/ river/jtsk/merge/test/src/tests/support/ArrayListOverflow.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/ArrayListOverflow.java river/jtsk/merge/test/src/tests/support/EndlessLoopTask.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/EndlessLoopTask.java river/jtsk/merge/test/src/tests/support/FakePrincipal.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/FakePrincipal.java river/jtsk/merge/test/src/tests/support/MutableMap.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/MutableMap.java river/jtsk/merge/test/src/tests/support/MyPrincipal.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/MyPrincipal.java river/jtsk/merge/test/src/tests/support/PrintTask.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/PrintTask.java river/jtsk/merge/test/src/tests/support/StackOverflowTask.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/StackOverflowTask.java river/jtsk/merge/test/src/tests/support/StringComparator.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/StringComparator.java river/jtsk/merge/test/src/tests/support/Support_Configuration.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Configuration.java river/jtsk/merge/test/src/tests/support/Support_Exec.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Exec.java river/jtsk/merge/test/src/tests/support/Support_GetLocal.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_GetLocal.java river/jtsk/merge/test/src/tests/support/Support_Resources.java - copied unchanged from r1290923, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Resources.java Removed: river/jtsk/merge/test/lib/MultithreadedTC-1.01.jar river/jtsk/merge/test/src/net/jini/io/ river/jtsk/merge/test/src/net/jini/security/policy/ Modified: river/jtsk/merge/test/src/net/jini/core/event/RemoteEventTest.java river/jtsk/merge/test/src/net/jini/security/GrantPermissionTest.java Modified: river/jtsk/merge/test/src/net/jini/core/event/RemoteEventTest.java URL: http://svn.apache.org/viewvc/river/jtsk/merge/test/src/net/jini/core/event/RemoteEventTest.java?rev=1290926&r1=1290925&r2=1290926&view=diff ============================================================================== --- river/jtsk/merge/test/src/net/jini/core/event/RemoteEventTest.java (original) +++ river/jtsk/merge/test/src/net/jini/core/event/RemoteEventTest.java Sun Feb 19 03:05:33 2012 @@ -18,8 +18,6 @@ package net.jini.core.event; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,9 +26,10 @@ import java.io.ObjectOutputStream; import java.rmi.MarshalledObject; import java.util.logging.Level; import java.util.logging.Logger; - +import net.jini.io.MarshalledInstance; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.*; /** * @@ -49,12 +48,12 @@ public class RemoteEventTest { @Before @SuppressWarnings("deprecation") public void setUp() { - try { - this.m = new MarshalledObject(this.s); - } catch (IOException ex) { - Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); - } - this.e = new RemoteEvent(this.source, 10L, 25L,this.m); + try { + m = new MarshalledObject(s); + } catch (IOException ex) { + Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); + } + e = new RemoteEvent(source, 10L, 25L,m); } /** @@ -62,11 +61,11 @@ public class RemoteEventTest { */ @Test public void getID() { - System.out.println("getID"); - RemoteEvent instance = this.e; - long expResult = 10L; - long result = instance.getID(); - assertEquals(expResult, result); + System.out.println("getID"); + RemoteEvent instance = e; + long expResult = 10L; + long result = instance.getID(); + assertEquals(expResult, result); } /** @@ -74,11 +73,11 @@ public class RemoteEventTest { */ @Test public void getSequenceNumber() { - System.out.println("getSequenceNumber"); - RemoteEvent instance = this.e; - long expResult = 25L; - long result = instance.getSequenceNumber(); - assertEquals(expResult, result); + System.out.println("getSequenceNumber"); + RemoteEvent instance = e; + long expResult = 25L; + long result = instance.getSequenceNumber(); + assertEquals(expResult, result); } /** @@ -86,47 +85,47 @@ public class RemoteEventTest { */ @Test public void getRegistrationObject() { - System.out.println("getRegistrationObject"); - RemoteEvent instance = this.e; - MarshalledObject expResult = this.m; - @SuppressWarnings("deprecation") - MarshalledObject result = instance.getRegistrationObject(); - assertEquals(expResult, result); + System.out.println("getRegistrationObject"); + RemoteEvent instance = e; + MarshalledObject expResult = m; + @SuppressWarnings("deprecation") + MarshalledObject result = instance.getRegistrationObject(); + assertEquals(expResult, result); } - + @Test public void testSerialization() { - ObjectOutputStream oos = null; - System.out.println("test serialization"); - MarshalledObject expResult = this.m; - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(baos); - oos.writeObject(this.e); - oos.flush(); - byte[] bytes = baos.toByteArray(); - ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - ObjectInputStream ois = new ObjectInputStream(bais); - RemoteEvent result = (RemoteEvent) ois.readObject(); - MarshalledObject moResult = result.getRegistrationObject(); - Object srcResult = result.getSource(); - long iDResult = result.getID(); - long seqResult = result.getSequenceNumber(); - assertEquals(expResult, moResult); - assertEquals(this.source, srcResult); - assertEquals(10L, iDResult); - assertEquals(25L, seqResult); - } catch (IOException ex) { - Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (ClassNotFoundException ex) { - Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); - } finally { - try { - oos.close(); - } catch (IOException ex) { - Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); - } - } + ObjectOutputStream oos = null; + System.out.println("test serialization"); + MarshalledObject expResult = m; + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + oos = new ObjectOutputStream(baos); + oos.writeObject(e); + oos.flush(); + byte[] bytes = baos.toByteArray(); + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + ObjectInputStream ois = new ObjectInputStream(bais); + RemoteEvent result = (RemoteEvent) ois.readObject(); + MarshalledObject moResult = result.getRegistrationObject(); + Object srcResult = result.getSource(); + long iDResult = result.getID(); + long seqResult = result.getSequenceNumber(); + assertEquals(expResult, moResult); + assertEquals(source, srcResult); + assertEquals(10L, iDResult); + assertEquals(25L, seqResult); + } catch (IOException ex) { + Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (ClassNotFoundException ex) { + Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); + } finally { + try { + oos.close(); + } catch (IOException ex) { + Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex); + } + } } } \ No newline at end of file Modified: river/jtsk/merge/test/src/net/jini/security/GrantPermissionTest.java URL: http://svn.apache.org/viewvc/river/jtsk/merge/test/src/net/jini/security/GrantPermissionTest.java?rev=1290926&r1=1290925&r2=1290926&view=diff ============================================================================== --- river/jtsk/merge/test/src/net/jini/security/GrantPermissionTest.java (original) +++ river/jtsk/merge/test/src/net/jini/security/GrantPermissionTest.java Sun Feb 19 03:05:33 2012 @@ -1,6 +1,19 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.jini.security; @@ -38,33 +51,29 @@ public class GrantPermissionTest { public void tearDown() throws Exception { } - /** - * Test of getActions method, of class GrantPermission. - */ -// @org.junit.Test -// public void getActions() { -// System.out.println("getActions"); -// GrantPermission instance = null; -// String expResult = ""; -// String result = instance.getActions(); -// assertEquals(expResult, result); -// // TODO review the generated test code and remove the default call to fail. -// fail("The test case is a prototype."); -// } - - /** - * Test of newPermissionCollection method, of class GrantPermission. + /** + * Test of string construction, of class GrantPermission. */ -// @org.junit.Test -// public void newPermissionCollection() { -// System.out.println("newPermissionCollection"); -// GrantPermission instance = null; -// PermissionCollection expResult = null; -// PermissionCollection result = instance.newPermissionCollection(); -// assertEquals(expResult, result); -// // TODO review the generated test code and remove the default call to fail. -// fail("The test case is a prototype."); -// } + @org.junit.Test + public void construct() { + System.out.println("String constructor"); + RuntimePermission rpD = new RuntimePermission("D", ""); +// RuntimePermission rpD1 = new RuntimePermission("D1"); +// RuntimePermission rpC = new RuntimePermission("C"); +// RuntimePermission rpC1 = new RuntimePermission("C1"); + + String rpDS = "delim=' java.lang.RuntimePermission 'D'"; + + GrantPermission gpS = new GrantPermission(rpDS); + GrantPermission gpP = new GrantPermission(rpD); + System.out.print(gpS.toString()); + System.out.print(gpP.toString()); + boolean result = gpS.implies(gpP); + boolean expResult = true; + assertEquals(expResult, result); + result = gpP.implies(gpS); + assertEquals(expResult, result); + } /** * Test of implies method, of class GrantPermission. @@ -199,7 +208,7 @@ public class GrantPermissionTest { System.out.println(msg); return ret == exp; } - + /** * Test of equals method, of class GrantPermission. */
