[jboss-svn-commits] JBoss Common SVN: r4153 - in arquillian/trunk: examples/domain/src/main/java/com/acme/ejb and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 10 11:54:35 EST 2010
Author: pete.muir at jboss.org
Date: 2010-03-10 11:54:34 -0500 (Wed, 10 Mar 2010)
New Revision: 4153
Modified:
arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverter.java
arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverterBean.java
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java
arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java
arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java
arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
Log:
ARQ-90, ARQ-91
Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml 2010-03-10 16:54:34 UTC (rev 4153)
@@ -116,7 +116,7 @@
return ((f - 32) * 5 / 9);
}
- public double convertToFarenheight(double c) {
+ public double convertToFarenheit(double c) {
return ((c * 9 / 5) + 32);
}
@@ -206,9 +206,9 @@
}
@Test
- public void testConvertToFarenheight() {
- Assert.assertEquals(converter.convertToFarenheight(0d), 32d);
- Assert.assertEquals(converter.convertToFarenheight(100d), 212d);
+ public void testConvertToFarenheit() {
+ Assert.assertEquals(converter.convertToFarenheit(0d), 32d);
+ Assert.assertEquals(converter.convertToFarenheit(100d), 212d);
}
}]]></programlisting>
@@ -238,9 +238,9 @@
}
@Test
- public void testConvertToFarenheight() {
- Assert.assertEquals(converter.convertToFarenheight(0d), 32d);
- Assert.assertEquals(converter.convertToFarenheight(100d), 212d);
+ public void testConvertToFarenheit() {
+ Assert.assertEquals(converter.convertToFarenheit(0d), 32d);
+ Assert.assertEquals(converter.convertToFarenheit(100d), 212d);
}
}]]></programlisting>
Modified: arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverter.java
===================================================================
--- arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverter.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverter.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -2,8 +2,12 @@
import javax.ejb.Local;
-public @Local interface TemperatureConverter {
- double convertToCelcius(double f);
- double convertToFarenheight(double c);
+public @Local
+interface TemperatureConverter
+{
+ double convertToCelsius(double f);
+
+ double convertToFarenheit(double c);
+
boolean isTransactional();
}
Modified: arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverterBean.java
===================================================================
--- arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverterBean.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/examples/domain/src/main/java/com/acme/ejb/TemperatureConverterBean.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -10,12 +10,12 @@
@Resource EJBContext ctx;
@Override
- public double convertToCelcius(double f) {
+ public double convertToCelsius(double f) {
return ((f - 32) * 5 / 9);
}
@Override
- public double convertToFarenheight(double c) {
+ public double convertToFarenheit(double c) {
return ((c * 9 / 5) + 32);
}
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -18,14 +18,13 @@
import javax.inject.Inject;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -2,11 +2,10 @@
import javax.ejb.EJB;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,15 +23,15 @@
}
@Test
- public void testConvertToCelcius() {
- Assert.assertEquals(converter.convertToCelcius(32d), 0d);
- Assert.assertEquals(converter.convertToCelcius(212d), 100d);
+ public void testConvertToCelsius() {
+ Assert.assertEquals(converter.convertToCelsius(32d), 0d, 0d);
+ Assert.assertEquals(converter.convertToCelsius(212d), 100d, 0d);
}
@Test
- public void testConvertToFarenheight() {
- Assert.assertEquals(converter.convertToFarenheight(0d), 32d);
- Assert.assertEquals(converter.convertToFarenheight(100d), 212d);
+ public void testConvertToFarenheit() {
+ Assert.assertEquals(converter.convertToFarenheit(0d), 32d, 0d);
+ Assert.assertEquals(converter.convertToFarenheit(100d), 212d, 0d);
}
@Test
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -1,6 +1,7 @@
package com.acme.ejb;
import javax.ejb.EJB;
+
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.Archives;
@@ -21,15 +22,15 @@
}
@Test
- public void testConvertToCelcius() {
- Assert.assertEquals(converter.convertToCelcius(32d), 0d);
- Assert.assertEquals(converter.convertToCelcius(212d), 100d);
+ public void testConvertToCelsius() {
+ Assert.assertEquals(converter.convertToCelsius(32d), 0d);
+ Assert.assertEquals(converter.convertToCelsius(212d), 100d);
}
@Test
- public void testConvertToFarenheight() {
- Assert.assertEquals(converter.convertToFarenheight(0d), 32d);
- Assert.assertEquals(converter.convertToFarenheight(100d), 212d);
+ public void testConvertToFarenheit() {
+ Assert.assertEquals(converter.convertToFarenheit(0d), 32d);
+ Assert.assertEquals(converter.convertToFarenheit(100d), 212d);
}
@Test
Modified: arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -16,10 +16,9 @@
*/
package org.jboss.arquillian.junit;
-import junit.framework.Assert;
-
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.junit.Assert;
import org.junit.Test;
/**
Modified: arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -16,10 +16,9 @@
*/
package org.jboss.arquillian.protocol.servlet;
-import junit.framework.Assert;
-
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.junit.Assert;
import org.junit.Test;
/**
Modified: arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -20,12 +20,11 @@
import java.lang.reflect.Method;
import java.net.URL;
-import junit.framework.Assert;
-
import org.jboss.arquillian.spi.TestMethodExecutor;
import org.jboss.arquillian.spi.TestResult;
import org.jboss.arquillian.spi.TestResult.Status;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2010-03-10 16:01:26 UTC (rev 4152)
+++ arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2010-03-10 16:54:34 UTC (rev 4153)
@@ -16,10 +16,9 @@
*/
package org.jboss.arquillian.testng;
-import junit.framework.Assert;
-
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.junit.Assert;
import org.junit.Test;
/**
More information about the jboss-svn-commits
mailing list