You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/09/02 23:45:29 UTC
svn commit: r992126 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/util/
common/src/main/java/org/apache/shindig/protocol/model/
common/src/test/java/org/apache/shindig/common/util/
common/src/test/java/org/apache/shindig/prot...
Author: lindner
Date: Thu Sep 2 21:45:29 2010
New Revision: 992126
URL: http://svn.apache.org/viewvc?rev=992126&view=rev
Log:
move test classes to test source directory
Added:
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
- copied, changed from r991728, shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FakeTimeSource.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java
- copied, changed from r991728, shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
- copied, changed from r991728, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
- copied, changed from r991728, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
Removed:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FakeTimeSource.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java
Copied: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java (from r991728, shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FakeTimeSource.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java?p2=shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java&p1=shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FakeTimeSource.java&r1=991728&r2=992126&rev=992126&view=diff
==============================================================================
(empty)
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java?rev=992126&r1=992125&r2=992126&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java Thu Sep 2 21:45:29 2010
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.protocol.conversion;
-import org.apache.shindig.protocol.model.TestModel;
+import org.apache.shindig.protocol.model.Model;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -113,19 +113,19 @@ public class BeanJsonConverterTest exten
String carJson = "{engine:[{value:DIESEL},{value:TURBO}],parkingTickets:{SF:$137,NY:'$301'}," +
"passengers:[{gender:female,name:'Mum'}, {gender:male,name:'Dad'}]}";
- TestModel.Car car = beanJsonConverter.convertToObject(carJson, TestModel.Car.class);
- ArrayList<TestModel.Engine> engineInfo = Lists.newArrayList(TestModel.Engine.DIESEL,
- TestModel.Engine.TURBO);
+ Model.Car car = beanJsonConverter.convertToObject(carJson, Model.Car.class);
+ ArrayList<Model.Engine> engineInfo = Lists.newArrayList(Model.Engine.DIESEL,
+ Model.Engine.TURBO);
for (int i = 0; i < car.getEngine().size(); i++) {
assertEquals(car.getEngine().get(i).getValue(), engineInfo.get(i));
}
assertEquals(car.getParkingTickets(), ImmutableMap.of("SF", "$137", "NY", "$301"));
- TestModel.Passenger mum = car.getPassengers().get(0);
- assertEquals(TestModel.Gender.female, mum.getGender());
+ Model.Passenger mum = car.getPassengers().get(0);
+ assertEquals(Model.Gender.female, mum.getGender());
assertEquals("Mum", mum.getName());
- TestModel.Passenger dad = car.getPassengers().get(1);
- assertEquals(TestModel.Gender.male, dad.getGender());
+ Model.Passenger dad = car.getPassengers().get(1);
+ assertEquals(Model.Gender.male, dad.getGender());
assertEquals("Dad", dad.getName());
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java?rev=992126&r1=992125&r2=992126&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java Thu Sep 2 21:45:29 2010
@@ -19,7 +19,7 @@ package org.apache.shindig.protocol.conv
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.xml.XmlUtil;
-import org.apache.shindig.protocol.model.TestModel;
+import org.apache.shindig.protocol.model.Model;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
@@ -29,7 +29,6 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Maps;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import java.util.Map;
@@ -38,12 +37,12 @@ import java.util.Map;
* Basic test for betwixt based XML conversion
*/
public class BeanXmlConverterTest extends Assert {
- private TestModel.Car car;
+ private Model.Car car;
private BeanXmlConverter beanXmlConverter;
@Before
public void setUp() throws Exception {
- car = new TestModel.Car();
+ car = new Model.Car();
beanXmlConverter = new BeanXmlConverter();
}
@@ -52,7 +51,7 @@ public class BeanXmlConverterTest extend
String xml = beanXmlConverter.convertToXml(car);
XMLUnit.setIgnoreWhitespace(true);
Diff diff;
- diff = new Diff(TestModel.Car.DEFAULT_XML, xml);
+ diff = new Diff(Model.Car.DEFAULT_XML, xml);
diff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
XMLAssert.assertXMLEqual(diff, true);
}
Copied: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java (from r991728, shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java?p2=shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java&p1=shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java&r1=991728&r2=992126&rev=992126&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java Thu Sep 2 21:45:29 2010
@@ -26,7 +26,7 @@ import com.google.common.collect.Maps;
/**
* Limited model to fully exercise data binding
*/
-public class TestModel {
+public class Model {
public static class Car {
public static final String DEFAULT_JSON =
@@ -37,22 +37,22 @@ public class TestModel {
public static final String DEFAULT_XML =
"<response>" +
"<engine>" +
- "<EnumImpl><value><declaringClass>org.apache.shindig.protocol.model.TestModel$Engine</declaringClass><displayValue>Gas</displayValue></value></EnumImpl>" +
- "<EnumImpl><value><declaringClass>org.apache.shindig.protocol.model.TestModel$Engine</declaringClass><displayValue>Hybrid</displayValue></value></EnumImpl>" +
+ "<EnumImpl><value><declaringClass>org.apache.shindig.protocol.model.Model$Engine</declaringClass><displayValue>Gas</displayValue></value></EnumImpl>" +
+ "<EnumImpl><value><declaringClass>org.apache.shindig.protocol.model.Model$Engine</declaringClass><displayValue>Hybrid</displayValue></value></EnumImpl>" +
"</engine>" +
"<parkingTickets>" +
"<entry><key>TOKYO</key><value>250Y</value></entry>" +
"<entry><key>BERKELEY</key><value>$120</value></entry>" +
"</parkingTickets>" +
"<passengers>" +
- "<TestModelPassenger>" +
- "<gender><declaringClass>org.apache.shindig.protocol.model.TestModel$Gender</declaringClass></gender>" +
+ "<ModelPassenger>" +
+ "<gender><declaringClass>org.apache.shindig.protocol.model.Model$Gender</declaringClass></gender>" +
"<name>Dick Dastardly</name>" +
- "</TestModelPassenger>" +
- "<TestModelPassenger>" +
- "<gender><declaringClass>org.apache.shindig.protocol.model.TestModel$Gender</declaringClass></gender>" +
+ "</ModelPassenger>" +
+ "<ModelPassenger>" +
+ "<gender><declaringClass>org.apache.shindig.protocol.model.Model$Gender</declaringClass></gender>" +
"<name>Speed Racer</name>" +
- "</TestModelPassenger>" +
+ "</ModelPassenger>" +
"</passengers></response>";
private List<Enum<Engine>> engine;
Copied: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java (from r991728, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java?p2=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java&p1=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java&r1=991728&r2=992126&rev=992126&view=diff
==============================================================================
(empty)
Copied: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java (from r991728, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java?p2=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java&p1=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java&r1=991728&r2=992126&rev=992126&view=diff
==============================================================================
(empty)