Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 90892 invoked from network); 5 May 2010 11:11:40 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 May 2010 11:11:40 -0000 Received: (qmail 29592 invoked by uid 500); 5 May 2010 11:11:40 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 29530 invoked by uid 500); 5 May 2010 11:11:39 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 29518 invoked by uid 99); 5 May 2010 11:11:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 11:11:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 11:11:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EA2F02388897; Wed, 5 May 2010 11:10:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941246 - in /tuscany/sca-java-2.x/trunk/modules/node-impl/src/test: java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java resources/test.properties Date: Wed, 05 May 2010 11:10:45 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100505111045.EA2F02388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Wed May 5 11:10:45 2010 New Revision: 941246 URL: http://svn.apache.org/viewvc?rev=941246&view=rev Log: Update testcase to test default scheme Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/resources/test.properties Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java?rev=941246&r1=941245&r2=941246&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java (original) +++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java Wed May 5 11:10:45 2010 @@ -159,26 +159,28 @@ public class NodeImplTestCase { Assert.assertEquals("vm", ps.getProperty("defaultScheme")); Properties properties = new Properties(); + properties.setProperty("defaultScheme", "vm"); properties.setProperty("foo.bla", "some value"); factory = (NodeFactoryImpl)NodeFactory.newInstance(properties); factory.init(); utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class); ps = utilities.getUtility(RuntimeProperties.class).getProperties(); - Assert.assertEquals(1, ps.size()); + Assert.assertEquals(2, ps.size()); Assert.assertEquals("some value", ps.getProperty("foo.bla")); factory = (NodeFactoryImpl)NodeFactory.newInstance("properties:test.properties"); factory.init(); utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class); ps = utilities.getUtility(RuntimeProperties.class).getProperties(); - Assert.assertEquals(1, ps.size()); + Assert.assertEquals(2, ps.size()); Assert.assertEquals("xyz", ps.getProperty("foo.bla")); - factory = (NodeFactoryImpl)NodeFactory.newInstance("uri:foo?k1=v1&k2=v2"); + factory = (NodeFactoryImpl)NodeFactory.newInstance("uri:foo?k1=v1&k2=v2&defaultScheme=vm"); factory.init(); utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class); ps = utilities.getUtility(RuntimeProperties.class).getProperties(); - Assert.assertEquals(3, ps.size()); + Assert.assertEquals(4, ps.size()); + Assert.assertEquals("vm", ps.getProperty("defaultScheme")); Assert.assertEquals("foo", ps.getProperty("defaultDomainName")); Assert.assertEquals("v1", ps.getProperty("k1")); Assert.assertEquals("v2", ps.getProperty("k2")); Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/resources/test.properties URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/resources/test.properties?rev=941246&r1=941245&r2=941246&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/resources/test.properties (original) +++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/resources/test.properties Wed May 5 11:10:45 2010 @@ -1,2 +1,4 @@ +defaultScheme = vm foo.bla = xyz +