incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmar...@apache.org
Subject svn commit: r1382395 - in /incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config: ConfigurationSettingsTest.java Test.properties
Date Sun, 09 Sep 2012 03:58:16 GMT
Author: cmarcum
Date: Sun Sep  9 03:58:16 2012
New Revision: 1382395

URL: http://svn.apache.org/viewvc?rev=1382395&view=rev
Log:
modified test.properties for office and sdk to default linux location and updated configuration
settings test to use them

Modified:
    incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/ConfigurationSettingsTest.java
    incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/Test.properties

Modified: incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/ConfigurationSettingsTest.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/ConfigurationSettingsTest.java?rev=1382395&r1=1382394&r2=1382395&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/ConfigurationSettingsTest.java
(original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/ConfigurationSettingsTest.java
Sun Sep  9 03:58:16 2012
@@ -66,8 +66,12 @@ public class ConfigurationSettingsTest e
         assertNotNull(instance);
         String office = instance.getValue(ConfigurationSettings.KEY_OFFICE_INSTALLATION);
         String sdk = instance.getValue(ConfigurationSettings.KEY_SDK_INSTALLATION);
-        assertEquals("", sdk);
-        assertEquals("", office);
+        TestProperties testProps = new TestProperties();
+        assertNotNull(testProps);
+        Properties props = TestProperties.getTestProperties();
+        assertNotNull(props);
+        assertEquals(props.getProperty("SDKInstallation"), sdk);
+        assertEquals(props.getProperty("OfficeInstallation"), office);
     }
 
     /**

Modified: incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/Test.properties
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/Test.properties?rev=1382395&r1=1382394&r2=1382395&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/Test.properties
(original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/test/unit/src/org/openoffice/extensions/config/Test.properties
Sun Sep  9 03:58:16 2012
@@ -1,4 +1,4 @@
 # Sample ResourceBundle properties file
-OfficeInstallation=/export/home/sg128468/office/jsc21/opt/staroffice9
-SDKInstallation=/export/home/sg128468/office/jsc21/opt/openoffice.org/basis3.0/sdk
+OfficeInstallation=/opt/openoffice.org3
+SDKInstallation=/opt/openoffice.org/basis3.4/sdk
 PluginPath=/export/home/sg128468/tmp/api/oonetbeansintegration/ooextensions/build/org-openoffice-extensions.nbm



Mime
View raw message