You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/12/04 22:09:33 UTC
svn commit: r723439 [4/4] - in /tuscany/java/sca/itest: ./
bpel/helloworld-reference/ bpel/helloworld-ws/ builder/
builder/src/test/java/org/apache/tuscany/sca/itest/builder/
callablereferences-ws/ callablereferences/
callablereferences/src/test/java/o...
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("BPELProcessNotFound", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("CannotResolveWSDLReference", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java Thu Dec 4 13:09:28 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.Problem;
import domain.CustomCompositeBuilder;
@@ -49,10 +49,19 @@
//nothing to do
}
+ private static boolean isMessageLogged(Monitor monitor, String messageId) {
+ for (Problem problem : monitor.getProblems()){
+ if (problem.getMessageId().equals(messageId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
- /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ assertTrue(isMessageLogged(monitor, "PartnerLinkHasBothAttr"));
+ /*Problem problem = monitor.getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
}
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java Thu Dec 4 13:09:28 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.Problem;
import domain.CustomCompositeBuilder;
@@ -49,10 +49,19 @@
//nothing to do
}
+ private static boolean isMessageLogged(Monitor monitor, String messageId) {
+ for (Problem problem : monitor.getProblems()){
+ if (problem.getMessageId().equals(messageId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
- /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ assertTrue(isMessageLogged(monitor, "PartnerLinkTypeNoRoles"));
+ /*Problem problem = monitor.getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("EJBLinkAttributeMissing", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("ClassNotFoundException", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java Thu Dec 4 13:09:28 2008
@@ -23,7 +23,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +50,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
Assert.assertNotNull(problem);
Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java Thu Dec 4 13:09:28 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.Problem;
import domain.CustomCompositeBuilder;
@@ -48,10 +48,19 @@
protected void tearDown() throws Exception {
//node.stop();
}
+
+ private static boolean isMessageLogged(Monitor monitor, String messageId) {
+ for (Problem problem : monitor.getProblems()){
+ if (problem.getMessageId().equals(messageId)){
+ return true;
+ }
+ }
+ return false;
+ }
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
+ assertTrue(isMessageLogged(monitor, "ContributionResolveException"));
//assertEquals("ContributionResolveException", problem.getMessageId());
}
}
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
//assertNotNull(problem);
//assertEquals("UnableToResolveComponentType", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java Thu Dec 4 13:09:28 2008
@@ -23,7 +23,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +50,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
Assert.assertNotNull(problem);
Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("CouldNotLocateFile", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("ClassNotFoundException", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
//assertNotNull(problem);
//assertEquals("ContributionResolveException", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java Thu Dec 4 13:09:28 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.Problem;
import domain.CustomCompositeBuilder;
@@ -49,10 +49,19 @@
//node.stop();
}
+ private static boolean isMessageLogged(Monitor monitor, String messageId) {
+ for (Problem problem : monitor.getProblems()){
+ if (problem.getMessageId().equals(messageId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
- /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ assertTrue(isMessageLogged(monitor, "IntentNotSpecified"));
+ /*Problem problem = monitor.getLastLoggedProblem();
assertNotNull(problem);
assertEquals("IntentNotSpecified", problem.getMessageId());*/
}
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MayProvideIntentNotFound", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("RequiredAttributeMissing", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java Thu Dec 4 13:09:28 2008
@@ -20,8 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.junit.Ignore;
import org.junit.Ignore;
import domain.CustomCompositeBuilder;
@@ -56,9 +55,9 @@
//elements...
/*
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("UnableToMapPolicies"));
+ assertTrue(monitor.isMessageLogged("UnableToMapPolicies"));
*/
- /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ /*Problem problem = monitor.getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnableToMapPolicies", problem.getMessageId());*/
}
Modified: tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());
Modified: tuscany/java/sca/itest/ws-void-args-return/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/ws-void-args-return/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/ws-void-args-return/pom.xml (original)
+++ tuscany/java/sca/itest/ws-void-args-return/pom.xml Thu Dec 4 13:09:28 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>