[Red5commits] [1415] updates to my branches
pgregoire
luke at codegent.com
Tue Sep 26 14:30:54 EDT 2006
updates to my branches
Timestamp: 09/26/06 13:26:02 EST (less than one hour ago)
Change: 1415
Author: pgregoire
Files (see diff or trac for details):
java/server/branches/dev_paulg/src/org/red5/io/amf3/AMF3.java
java/server/branches/dev_paulg/src/org/red5/io/flv/FLVHeader.java
java/server/branches/dev_paulg/src/org/red5/io/flv/IFLVService.java
java/server/branches/dev_paulg/src/org/red5/io/flv/impl/FLV.java
java/server/branches/dev_paulg/src/org/red5/io/flv/impl/FLVReader.java
java/server/branches/dev_paulg/src/org/red5/io/flv/impl/FLVService.java
java/server/branches/dev_paulg/src/org/red5/io/flv/meta/IMeta.java
java/server/branches/dev_paulg/src/org/red5/io/flv/meta/IMetaCue.java
java/server/branches/dev_paulg/src/org/red5/io/flv/meta/IMetaData.java
java/server/branches/dev_paulg/src/org/red5/io/flv/meta/MetaData.java
java/server/branches/dev_paulg/src/org/red5/io/mock/Input.java
java/server/branches/dev_paulg/src/org/red5/io/mock/Output.java
java/server/branches/dev_paulg/src/org/red5/io/mp3/impl/MP3Header.java
java/server/branches/dev_paulg/src/org/red5/io/mp3/impl/MP3Reader.java
java/server/branches/dev_paulg/src/org/red5/io/mp3/impl/MP3Service.java
java/server/branches/dev_paulg/src/org/red5/io/object/BaseInput.java
java/server/branches/dev_paulg/src/org/red5/io/object/BaseOutput.java
java/server/branches/dev_paulg/src/org/red5/io/object/Deserializer.java
java/server/branches/dev_paulg/src/org/red5/io/object/Input.java
java/server/branches/dev_paulg/src/org/red5/io/object/RecordSet.java
java/server/branches/dev_paulg/src/org/red5/io/object/Serializer.java
java/server/branches/dev_paulg/src/org/red5/io/object/SerializerOpts.java
java/server/branches/dev_paulg/src/org/red5/io/utils/BufferUtils.java
java/server/branches/dev_paulg/src/org/red5/io/utils/HexDump.java
java/server/branches/dev_paulg/src/org/red5/io/utils/XMLUtils.java
java/server/branches/dev_paulg/src/org/red5/samples/components/ClientManager.java
java/server/branches/dev_paulg/src/org/red5/samples/services/EchoService.java
java/server/branches/dev_paulg/src/org/red5/samples/services/IEchoService.java
java/server/branches/dev_paulg/src/org/red5/server/BaseConnection.java
java/server/branches/dev_paulg/src/org/red5/server/ContextLoader.java
java/server/branches/dev_paulg/src/org/red5/server/CoreHandler.java
java/server/branches/dev_paulg/src/org/red5/server/ScopeResolver.java
java/server/branches/dev_paulg/src/org/red5/server/Server.java
java/server/branches/dev_paulg/src/org/red5/server/Standalone.java
java/server/branches/dev_paulg/src/org/red5/server/WebScope.java
java/server/branches/dev_paulg/src/org/red5/server/adapter/AbstractScopeAdapter.java
java/server/branches/dev_paulg/src/org/red5/server/adapter/ApplicationAdapter.java
java/server/branches/dev_paulg/src/org/red5/server/api/IBandwidthConfigure.java
java/server/branches/dev_paulg/src/org/red5/server/api/IClientRegistry.java
java/server/branches/dev_paulg/src/org/red5/server/api/IConnection.java
java/server/branches/dev_paulg/src/org/red5/server/api/IContext.java
java/server/branches/dev_paulg/src/org/red5/server/api/IFlowControllable.java
java/server/branches/dev_paulg/src/org/red5/server/api/event/IEvent.java
java/server/branches/dev_paulg/src/org/red5/server/api/event/IEventHandler.java
java/server/branches/dev_paulg/src/org/red5/server/api/event/IEventListener.java
java/server/branches/dev_paulg/src/org/red5/server/api/event/IEventObservable.java
java/server/branches/dev_paulg/src/org/red5/server/api/scheduling/ISchedulingService.java
java/server/branches/dev_paulg/src/org/red5/server/api/service/IPendingServiceCallback.java
java/server/branches/dev_paulg/src/org/red5/server/api/service/IServiceHandlerProvider.java
java/server/branches/dev_paulg/src/org/red5/server/api/so/ISharedObjectHandlerProvider.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IPlayItem.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IPlaylist.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IStream.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IStreamAwareScopeHandler.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IStreamCapableConnection.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IStreamService.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/IVideoStreamCodec.java
java/server/branches/dev_paulg/src/org/red5/server/api/stream/support/SimpleBandwidthConfigure.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/AbstractPipe.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/IMessage.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/IMessageInput.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/IMessageOutput.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/IPipe.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/IPipeConnectionListener.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/InMemoryPullPullPipe.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/InMemoryPushPushPipe.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/OOBControlMessage.java
java/server/branches/dev_paulg/src/org/red5/server/messaging/PipeConnectionEvent.java
java/server/branches/dev_paulg/src/org/red5/server/net/proxy/DebugProxyHandler.java
java/server/branches/dev_paulg/src/org/red5/server/net/proxy/NetworkDumpFilter.java
java/server/branches/dev_paulg/src/org/red5/server/net/proxy/ProxyFilter.java
java/server/branches/dev_paulg/src/org/red5/server/net/remoting/RemotingClient.java
java/server/branches/dev_paulg/src/org/red5/server/net/remoting/codec/RemotingProtocolDecoder.java
java/server/branches/dev_paulg/src/org/red5/server/net/remoting/codec/RemotingProtocolEncoder.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/Channel.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/RTMPConnection.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/RTMPHandler.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/RTMPMinaConnection.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/event/AllocationDebugger.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/event/FLVData.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/event/VideoData.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/message/Constants.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/message/Header.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/message/Packet.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/status/StatusCodes.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmp/status/StatusObjectService.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmpt/RTMPTConnection.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmpt/RTMPTHandler.java
java/server/branches/dev_paulg/src/org/red5/server/net/rtmpt/RTMPTLoader.java
java/server/branches/dev_paulg/src/org/red5/server/net/servlet/RTMPTServlet.java
java/server/branches/dev_paulg/src/org/red5/server/net/servlet/RequestDumpServlet.java
java/server/branches/dev_paulg/src/org/red5/server/net/servlet/StatisticsServlet.java
java/server/branches/dev_paulg/src/org/red5/server/net/servlet/ZAMFGatewayServlet.java
java/server/branches/dev_paulg/src/org/red5/server/persistence/FilePersistence.java
java/server/branches/dev_paulg/src/org/red5/server/persistence/RamPersistence.java
java/server/branches/dev_paulg/src/org/red5/server/scheduling/QuartzSchedulingServiceJob.java
java/server/branches/dev_paulg/src/org/red5/server/service/ConversionUtils.java
java/server/branches/dev_paulg/src/org/red5/server/service/IServiceResolver.java
java/server/branches/dev_paulg/src/org/red5/server/service/ScopeServiceResolver.java
java/server/branches/dev_paulg/src/org/red5/server/service/ServiceUtils.java
java/server/branches/dev_paulg/src/org/red5/server/so/ISharedObjectEvent.java
java/server/branches/dev_paulg/src/org/red5/server/so/SharedObjectEvent.java
java/server/branches/dev_paulg/src/org/red5/server/so/SharedObjectService.java
java/server/branches/dev_paulg/src/org/red5/server/statistics/ScopeStatistics.java
java/server/branches/dev_paulg/src/org/red5/server/stream/BalancedFlowControlService.java
java/server/branches/dev_paulg/src/org/red5/server/stream/ClientBroadcastStream.java
java/server/branches/dev_paulg/src/org/red5/server/stream/FileStreamSource.java
java/server/branches/dev_paulg/src/org/red5/server/stream/IFlowControlService.java
java/server/branches/dev_paulg/src/org/red5/server/stream/IProviderService.java
java/server/branches/dev_paulg/src/org/red5/server/stream/ISeekableProvider.java
java/server/branches/dev_paulg/src/org/red5/server/stream/ISeekableStreamSource.java
java/server/branches/dev_paulg/src/org/red5/server/stream/ITokenBucket.java
java/server/branches/dev_paulg/src/org/red5/server/stream/ITokenBucketService.java
java/server/branches/dev_paulg/src/org/red5/server/stream/OutputStream.java
java/server/branches/dev_paulg/src/org/red5/server/stream/PlayBuffer.java
java/server/branches/dev_paulg/src/org/red5/server/stream/PlaylistSubscriberStream.java
java/server/branches/dev_paulg/src/org/red5/server/stream/ServerStream.java
java/server/branches/dev_paulg/src/org/red5/server/stream/SimpleFlowControlService.java
java/server/branches/dev_paulg/src/org/red5/server/stream/StreamFlow.java
java/server/branches/dev_paulg/src/org/red5/server/stream/VideoFrameDropper.java
java/server/branches/dev_paulg/src/org/red5/server/stream/filter/StreamBandwidthController.java
java/server/branches/dev_paulg/test/org/red5/server/api/test/BaseTest.java
java/server/branches/dev_paulg/test/org/red5/server/api/test/ScopeTest.java
java/server/branches/dev_paulg/test/org/red5/server/api/test/ServiceTest.java
java/server/branches/dev_paulg/test/org/red5/server/api/test/SharedObjectTest.java
java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPTestCase.java
java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPUtilsTest.java
java/server/branches/dev_paulg/test/org/red5/server/service/test/ConversionUtilsTest.java
java/server/branches/dev_paulg/test/org/red5/server/service/test/ServiceInvokerTest.java
java/server/branches/dev_paulg/test/org/red5/server/service/test/TestEchoService.java
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1415
Index: /java/server/branches/dev_paulg/test/org/red5/server/service/test/TestEchoService.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/service/test/TestEchoService.java (revision 1388)
+++ /java/server/branches/dev_paulg/test/org/red5/server/service/test/TestEchoService.java (revision 1415)
@@ -23,8 +23,4 @@
*/
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -32,10 +28,15 @@
import java.util.List;
import java.util.Map;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+import java.io.StringReader;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.TestCase;
import org.red5.samples.services.EchoService;
@@ -45,8 +46,9 @@
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
public class TestEchoService extends TestCase {
private IEchoService echoService;
-
protected void setUp() throws Exception {
super.setUp();
@@ -58,21 +60,20 @@
echoService = null;
}
-
+
public void testEchoBoolean() {
boolean b = true;
assertTrue(echoService.echoBoolean(b));
}
-
+
public void testEchoNumber() {
double num = 100;
- assertEquals(200, echoService.echoNumber(num), echoService
- .echoNumber(num));
+ assertEquals(200, echoService.echoNumber(num), echoService.echoNumber(num));
}
-
+
public void testEchoString() {
String str = "This is a test.";
assertEquals("This is a test.", echoService.echoString(str));
}
-
+
public void testEchoDate() throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy");
@@ -81,5 +82,5 @@
assertEquals(startDate.getTime(), returnDate.getTime());
}
-
+
public void testEchoObject() {
String str = "entry one";
@@ -90,9 +91,9 @@
Map resultMap = echoService.echoObject(startMap);
assertEquals(startMap.get("string"), resultMap.get("string"));
- assertEquals(startMap.get("date"), resultMap.get("date"));
+ assertEquals(startMap.get("date"), resultMap.get("date"));
}
-
+
public void testEchoArray() {
- Object[] startArray = { "first", "second", "third" };
+ Object[] startArray = {"first", "second", "third"};
Object[] resultArray = echoService.echoArray(startArray);
assertEquals(startArray[0], resultArray[0]);
@@ -100,5 +101,5 @@
assertEquals(startArray[2], resultArray[2]);
}
-
+
public void testEchoList() {
List startList = new ArrayList();
@@ -108,8 +109,7 @@
assertEquals(startList.get(0), resultList.get(0));
assertEquals(startList.get(1), resultList.get(1));
- }
-
- public void testEchoXML() throws SAXException, IOException,
- ParserConfigurationException {
+ }
+
+ public void testEchoXML() throws SAXException, IOException, ParserConfigurationException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -117,8 +117,7 @@
StringReader reader = new StringReader(xmlStr);
InputSource source = new InputSource(reader);
- Document xml = builder.parse(source);
+ Document xml = builder.parse(source);
Document resultXML = echoService.echoXML(xml);
- assertEquals(xml.getFirstChild().getNodeValue(), resultXML
- .getFirstChild().getNodeValue());
+ assertEquals(xml.getFirstChild().getNodeValue(), resultXML.getFirstChild().getNodeValue());
}
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/service/test/ConversionUtilsTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/service/test/ConversionUtilsTest.java (revision 1357)
+++ /java/server/branches/dev_paulg/test/org/red5/server/service/test/ConversionUtilsTest.java (revision 1415)
@@ -33,67 +33,66 @@
import org.red5.server.service.ConversionUtils;
-// TODO: Add more tests here.
+// TODO: Add more tests here.
public class ConversionUtilsTest extends TestCase {
private static final Log log = LogFactory.getLog(ConversionUtilsTest.class);
-
- public void testBasic() {
+
+ public void testBasic(){
Object result = ConversionUtils.convert(new Integer(42), String.class);
- if (!(result instanceof String))
- Assert.fail("Should be a string");
+ if(!(result instanceof String)) Assert.fail("Should be a string");
String str = (String) result;
- Assert.assertEquals("42", str);
+ Assert.assertEquals("42",str);
}
-
- public void testConvertListToStringArray() {
+
+ public void testConvertListToStringArray(){
ArrayList source = new ArrayList();
-
+
source.add("Testing 1");
source.add("Testing 2");
source.add("Testing 3");
-
+
Class target = (new String[0]).getClass();
-
- Object result = ConversionUtils.convert(source, target);
- if (!(result.getClass().isArray() && result.getClass()
- .getComponentType().equals(String.class))) {
- Assert.fail("Should be String[]");
+
+ Object result = ConversionUtils.convert(source,target);
+ if(!(result.getClass().isArray()
+ && result.getClass().getComponentType().equals(String.class))){
+ Assert.fail("Should be String[]");
}
String[] results = (String[]) result;
-
+
Assert.assertEquals(results.length, source.size());
- Assert.assertEquals(results[2], source.get(2));
+ Assert.assertEquals(results[2], source.get(2));
}
-
- public void testConvertObjectArrayToStringArray() {
+
+ public void testConvertObjectArrayToStringArray(){
Object[] source = new Object[3];
-
- source[0] = new Integer(21);
+
+ source[0]= new Integer(21);
source[1] = Boolean.FALSE;
source[2] = "Woot";
-
+
Class target = (new String[0]).getClass();
-
- Object result = ConversionUtils.convert(source, target);
- if (!(result.getClass().isArray() && result.getClass()
- .getComponentType().equals(String.class))) {
- Assert.fail("Should be String[]");
+
+ Object result = ConversionUtils.convert(source,target);
+ if(!(result.getClass().isArray()
+ && result.getClass().getComponentType().equals(String.class))){
+ Assert.fail("Should be String[]");
}
String[] results = (String[]) result;
-
+
Assert.assertEquals(results.length, source.length);
Assert.assertEquals(results[2], source[2]);
}
-
- public void testNoOppConvert() {
+
+ public void testNoOppConvert(){
TestJavaBean source = new TestJavaBean();
Object result = ConversionUtils.convert(source, TestJavaBean.class);
Assert.assertEquals(result, source);
}
-
- public void testNullConvert() {
+
+ public void testNullConvert(){
Object result = ConversionUtils.convert(null, TestJavaBean.class);
Assert.assertNull(result);
@@ -101,21 +100,21 @@
Assert.assertNull(result);
}
-
- public void testConvertToSet() {
+
+ public void testConvertToSet(){
Object[] source = new Object[3];
- source[0] = new Integer(21);
+ source[0]= new Integer(21);
source[1] = Boolean.FALSE;
source[2] = "Woot";
Object result = ConversionUtils.convert(source, Set.class);
- if (!(result instanceof Set))
- Assert.fail("Should be a set");
+ if(!(result instanceof Set)) Assert.fail("Should be a set");
Set results = (Set) result;
Assert.assertEquals(results.size(), source.length);
-
+
}
-
+
class TestJavaBean {
-
+
+
}
-
+
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/service/test/ServiceInvokerTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/service/test/ServiceInvokerTest.java (revision 1357)
+++ /java/server/branches/dev_paulg/test/org/red5/server/service/test/ServiceInvokerTest.java (revision 1415)
@@ -37,25 +37,21 @@
// TODO: Add more tests!
- // we dont have to test all the echo methods, more test the call object
- // works as expected
- // the correct types of status are returned (method not found) etc.
- // Also, we need to add tests which show the way the parameter conversion
- // works.
- // So have a few methods with the same name, and try with diff params,
- // making sure right one gets called.
-
- protected static Log log = LogFactory.getLog(ServiceInvokerTest.class
- .getName());
-
+ // we dont have to test all the echo methods, more test the call object works as expected
+ // the correct types of status are returned (method not found) etc.
+ // Also, we need to add tests which show the way the parameter conversion works.
+ // So have a few methods with the same name, and try with diff params, making sure right one gets called.
+
+ protected static Log log =
+ LogFactory.getLog(ServiceInvokerTest.class.getName());
+
protected ApplicationContext appCtx = null;
-
+
protected void setUp() throws Exception {
// TODO Auto-generated method stub
super.setUp();
- appCtx = new ClassPathXmlApplicationContext(
- "org/red5/server/service/test/testcontext.xml");
+ appCtx = new ClassPathXmlApplicationContext("org/red5/server/service/test/testcontext.xml");
}
-
- public void testAppContextLoaded() {
+
+ public void testAppContextLoaded(){
Assert.assertNotNull(appCtx);
Assert.assertNotNull(appCtx.getBean("serviceInvoker"));
@@ -63,38 +59,38 @@
}
- public void testSimpleEchoCall() {
- Object[] params = new Object[] { "Woot this is cool" };
- PendingCall call = new PendingCall("echoService", "echoString", params);
- ServiceInvoker invoker = (ServiceInvoker) appCtx
- .getBean(ServiceInvoker.SERVICE_NAME);
+ public void testSimpleEchoCall(){
+ Object[] params = new Object[]{"Woot this is cool"};
+ PendingCall call = new PendingCall("echoService","echoString", params);
+ ServiceInvoker invoker = (ServiceInvoker) appCtx.getBean(ServiceInvoker.SERVICE_NAME);
invoker.invoke(call, appCtx);
Assert.assertEquals(call.isSuccess(), true);
Assert.assertEquals(call.getResult(), params[0]);
}
-
- public void testExceptionStatus() {
- Object[] params = new Object[] { "Woot this is cool" };
- Call call = new Call("doesntExist", "echoString", params);
- ServiceInvoker invoker = (ServiceInvoker) appCtx
- .getBean(ServiceInvoker.SERVICE_NAME);
+
+ public void testExceptionStatus(){
+ Object[] params = new Object[]{"Woot this is cool"};
+ Call call = new Call("doesntExist","echoString", params);
+ ServiceInvoker invoker = (ServiceInvoker) appCtx.getBean(ServiceInvoker.SERVICE_NAME);
invoker.invoke(call, appCtx);
Assert.assertEquals(call.isSuccess(), false);
Assert.assertEquals(call.getStatus(), Call.STATUS_SERVICE_NOT_FOUND);
- call = new Call("echoService", "doesntExist", params);
+ call = new Call("echoService","doesntExist", params);
invoker.invoke(call, appCtx);
Assert.assertEquals(call.isSuccess(), false);
Assert.assertEquals(call.getStatus(), Call.STATUS_METHOD_NOT_FOUND);
- params = new Object[] { "too", "many", "params" };
- call = new Call("echoService", "echoString", params);
+ params = new Object[]{"too","many","params"};
+ call = new Call("echoService","echoString", params);
invoker.invoke(call, appCtx);
Assert.assertEquals(call.isSuccess(), false);
Assert.assertEquals(call.getStatus(), Call.STATUS_METHOD_NOT_FOUND);
}
-
+
protected void tearDown() throws Exception {
// TODO Auto-generated method stub
super.tearDown();
-
+
}
+
+
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPUtilsTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPUtilsTest.java (revision 1357)
+++ /java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPUtilsTest.java (revision 1415)
@@ -31,37 +31,41 @@
import org.red5.server.net.rtmp.RTMPUtils;
+
public class RTMPUtilsTest extends TestCase {
- protected static Log log = LogFactory.getLog(RTMPUtilsTest.class.getName());
-
- public void testDecodingHeader() {
-
+ protected static Log log =
+ LogFactory.getLog(RTMPUtilsTest.class.getName());
+
+ public void testDecodingHeader(){
+
log.debug("Testing");
/*
- * log.debug(""+(0x03 >> 6)); log.debug(""+(0x43 >> 6));
- * log.debug(""+(0x83 >> 6)); log.debug(""+((byte)(((byte)0xC3) >> 6)));
- */
- byte test;
+ log.debug(""+(0x03 >> 6));
+ log.debug(""+(0x43 >> 6));
+ log.debug(""+(0x83 >> 6));
+ log.debug(""+((byte)(((byte)0xC3) >> 6)));
+ */
+ byte test;
test = (byte) (0x03);
- log.debug(HexDump.byteArrayToHexString(new byte[] { test }));
- log.debug("" + test);
- log.debug("" + RTMPUtils.decodeHeaderSize(test));
-
+ log.debug(HexDump.byteArrayToHexString(new byte[]{test}));
+ log.debug(""+test);
+ log.debug(""+ RTMPUtils.decodeHeaderSize(test) );
+
test = (byte) (0x43);
- log.debug(HexDump.byteArrayToHexString(new byte[] { test }));
- log.debug("" + test);
- log.debug("" + RTMPUtils.decodeHeaderSize(test));
-
+ log.debug(HexDump.byteArrayToHexString(new byte[]{test}));
+ log.debug(""+test);
+ log.debug(""+ RTMPUtils.decodeHeaderSize(test) );
+
test = (byte) (0x83);
- log.debug(HexDump.byteArrayToHexString(new byte[] { test }));
- log.debug("" + test);
- log.debug("" + RTMPUtils.decodeHeaderSize(test));
+ log.debug(HexDump.byteArrayToHexString(new byte[]{test}));
+ log.debug(""+test);
+ log.debug(""+ RTMPUtils.decodeHeaderSize(test) );
test = (byte) (0xC3 - 256);
- log.debug(HexDump.byteArrayToHexString(new byte[] { test }));
- log.debug("" + test);
- log.debug("" + RTMPUtils.decodeHeaderSize(test));
-
- Assert.assertEquals(true, false);
+ log.debug(HexDump.byteArrayToHexString(new byte[]{test}));
+ log.debug(""+test);
+ log.debug(""+ RTMPUtils.decodeHeaderSize(test) );
+
+ Assert.assertEquals(true,false);
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPTestCase.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPTestCase.java (revision 1388)
+++ /java/server/branches/dev_paulg/test/org/red5/server/rtmp/test/RTMPTestCase.java (revision 1415)
@@ -7,4 +7,5 @@
import org.apache.commons.logging.LogFactory;
import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.filter.SSLFilter;
import org.red5.io.object.Deserializer;
import org.red5.io.object.Serializer;
@@ -17,14 +18,12 @@
public class RTMPTestCase extends TestCase implements Constants {
- protected static Log log = LogFactory.getLog(RTMPTestCase.class.getName());
-
+ protected static Log log =
+ LogFactory.getLog(RTMPTestCase.class.getName());
+
protected Serializer serializer;
-
protected Deserializer deserializer;
-
protected RTMPProtocolEncoder encoder;
-
protected RTMPProtocolDecoder decoder;
-
+
protected void setUp() throws Exception {
// TODO Auto-generated method stub
@@ -37,13 +36,13 @@
decoder.setDeserializer(deserializer);
}
-
- public void testHeaders() {
+
+ public void testHeaders(){
Header header = new Header();
- header.setChannelId((byte) 0x12);
+ header.setChannelId((byte)0x12);
header.setDataType(TYPE_INVOKE);
header.setStreamId(100);
header.setTimer(2);
header.setSize(320);
- ByteBuffer buf = encoder.encodeHeader(header, null);
+ ByteBuffer buf = encoder.encodeHeader(header,null);
buf.flip();
log.debug(buf.getHexDump());
@@ -52,8 +51,9 @@
Assert.assertEquals(header, result);
}
-
- public void testInvokePacket() {
+
+ public void testInvokePacket(){
Invoke invoke = new Invoke();
}
+
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/api/test/ServiceTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/api/test/ServiceTest.java (revision 1388)
+++ /java/server/branches/dev_paulg/test/org/red5/server/api/test/ServiceTest.java (revision 1415)
@@ -1,5 +1,4 @@
package org.red5.server.api.test;
-import static junit.framework.Assert.assertTrue;
import junit.framework.JUnit4TestAdapter;
@@ -7,18 +6,17 @@
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.service.PendingCall;
+import static junit.framework.Assert.assertTrue;
public class ServiceTest extends BaseTest {
- @Test
- public void simpletest() {
- IPendingServiceCall call = new PendingCall("echoService", "echoString",
- new Object[] { "My String" });
+ @Test public void simpletest(){
+ IPendingServiceCall call = new PendingCall("echoService","echoString",new Object[]{"My String"});
context.getServiceInvoker().invoke(call, context);
- assertTrue("result null", call.getResult() != null);
+ assertTrue("result null",call.getResult()!=null);
}
-
- public static junit.framework.Test suite() {
+
+ public static junit.framework.Test suite(){
return new JUnit4TestAdapter(ServiceTest.class);
}
-
+
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/api/test/ScopeTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/api/test/ScopeTest.java (revision 1357)
+++ /java/server/branches/dev_paulg/test/org/red5/server/api/test/ScopeTest.java (revision 1415)
@@ -13,19 +13,19 @@
public class ScopeTest extends BaseTest {
-
- @Test
- public void scopeResolver() {
-
- // Global
+
+ @Test public void scopeResolver(){
+
+ // Global
IScope global = context.getGlobalScope();
assertTrue("global scope not null", global != null);
assertTrue("should be global", ScopeUtils.isGlobal(global));
log.debug(global);
-
+
+
// Test App
- IScope testApp = context.resolveScope(path_app);
+ IScope testApp = context.resolveScope(path_app);
assertTrue("testApp scope not null", testApp != null);
log.debug(testApp);
-
+
// Test Room
IScope testRoom = context.resolveScope(path_room);
@@ -34,82 +34,76 @@
// Test App Not Found
try {
- IScope notFoundApp = context.resolveScope(path_app + "notfound");
+ IScope notFoundApp = context.resolveScope(path_app+"notfound");
log.debug(notFoundApp);
assertTrue("should have thrown an exception", false);
} catch (RuntimeException e) {
}
-
+
}
-
- @Test
- public void context() {
+
+ @Test public void context(){
IScope testRoom = context.resolveScope(path_room);
IContext context = testRoom.getContext();
- assertTrue("context should not be null", context != null);
+ assertTrue("context should not be null",context!=null);
log.debug(testRoom.getContext().getResource(""));
log.debug(testRoom.getResource(""));
log.debug(testRoom.getParent().getResource(""));
}
-
- @Test
- public void client() {
+
+ @Test public void client(){
IClientRegistry reg = context.getClientRegistry();
IClient client = reg.newClient(null);
- assertTrue("client should not be null", client != null);
+ assertTrue("client should not be null", client!=null);
}
-
- @Test
- public void handler() {
-
+
+ @Test public void handler(){
+
Scope testApp = (Scope) context.resolveScope(path_app);
- assertTrue("should have a handler", testApp.hasHandler());
-
+ assertTrue("should have a handler",testApp.hasHandler());
+
IClientRegistry reg = context.getClientRegistry();
IClient client = reg.newClient(null);
-
- TestConnection conn = new TestConnection(host, path_app, client.getId());
+
+ TestConnection conn = new TestConnection(host,path_app,client.getId());
conn.initialize(client);
-
- assertTrue("client should not be null", client != null);
+
+ assertTrue("client should not be null", client!=null);
log.debug(client);
-
+
String key = "key";
String value = "value";
- client.setAttribute(key, value);
+ client.setAttribute(key,value);
assertTrue("attributes not working", client.getAttribute(key) == value);
-
+
conn.connect(testApp);
-
+
assertTrue("app should have 1 client", testApp.getClients().size() == 1);
- assertTrue("host should have 1 client", testApp.getParent()
- .getClients().size() == 1);
-
+ assertTrue("host should have 1 client", testApp.getParent().getClients().size() == 1);
+
conn.close();
-
+
assertTrue("app should have 0 client", testApp.getClients().size() == 0);
- assertTrue("host should have 0 client", testApp.getParent()
- .getClients().size() == 0);
-
- // client.disconnect();
-
+ assertTrue("host should have 0 client", testApp.getParent().getClients().size() == 0);
+
+ //client.disconnect();
+
}
-
- @Test
- public void connectionHandler() {
-
- TestConnection conn = new TestConnection(host, path_app, null);
+
+ @Test public void connectionHandler(){
+
+ TestConnection conn = new TestConnection(host,path_app,null);
IScope scope = context.resolveScope(path_app);
- if (!conn.connect(scope)) {
+ if(!conn.connect(scope)){
assertTrue("didnt connect", false);
} else {
- assertTrue("should have a scope", conn.getScope() != null);
+ assertTrue("should have a scope", conn.getScope()!=null);
conn.close();
assertTrue("should not be connected", !conn.isConnected());
}
}
-
- public static junit.framework.Test suite() {
+
+ public static junit.framework.Test suite(){
return new JUnit4TestAdapter(ScopeTest.class);
}
-
+
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/api/test/BaseTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/api/test/BaseTest.java (revision 1388)
+++ /java/server/branches/dev_paulg/test/org/red5/server/api/test/BaseTest.java (revision 1415)
@@ -1,3 +1,5 @@
package org.red5.server.api.test;
+
+import junit.framework.JUnit4TestAdapter;
import org.apache.commons.logging.Log;
@@ -7,26 +9,23 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
+import static junit.framework.Assert.assertTrue;
public class BaseTest {
- protected static Log log = LogFactory.getLog(ScopeTest.class.getName());
-
+ protected static Log log =
+ LogFactory.getLog(ScopeTest.class.getName());
+
static final String config = "test/org/red5/server/api/test/context.xml";
-
static final String host = "localhost";
-
static final String path_app = "test";
-
static final String path_room = "test/room";
-
+
static ApplicationContext spring = null;
-
static IContext context = null;
- @BeforeClass
- public static void setup() {
+ @BeforeClass public static void setup(){
spring = new FileSystemXmlApplicationContext(config);
context = (IContext) spring.getBean("red5.context");
}
-
+
}
Index: /java/server/branches/dev_paulg/test/org/red5/server/api/test/SharedObjectTest.java
===================================================================
--- /java/server/branches/dev_paulg/test/org/red5/server/api/test/SharedObjectTest.java (revision 1357)
+++ /java/server/branches/dev_paulg/test/org/red5/server/api/test/SharedObjectTest.java (revision 1415)
@@ -12,30 +12,33 @@
import org.red5.server.so.SharedObjectService;
-public class SharedObjectTest extends BaseTest implements IEventListener {
+public class SharedObjectTest extends BaseTest
+ implements IEventListener {
protected String name = "testso";
-
- @Test
- public void sharedObjectService() {
+
+ @Test public void sharedObjectService(){
IScope scope = context.resolveScope(path_app);
ISharedObjectService service = new SharedObjectService();
- assertTrue("should be empty", !service.hasSharedObject(scope, "blah"));
- assertTrue("create so", service.createSharedObject(scope, name, false));
- assertTrue("so exists?", service.hasSharedObject(scope, name));
- ISharedObject so = service.getSharedObject(scope, name);
- assertTrue("so not null", so != null);
- assertTrue("name same", so.getName().equals(name));
- // assertTrue("persistent",!so.isPersistent());
+ assertTrue("should be empty",!service.hasSharedObject(scope,"blah"));
+ assertTrue("crea
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list