You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/07/06 19:15:41 UTC
svn commit: r419621 - in /beehive/trunk/controls/test/src:
junit-controls/org/apache/beehive/controls/test/controls/assembly/
junit-controls/org/apache/beehive/controls/test/controls/lifecycle/
junit-controls/org/apache/beehive/controls/test/controls/s...
Author: cschoett
Date: Thu Jul 6 10:15:41 2006
New Revision: 419621
URL: http://svn.apache.org/viewvc?rev=419621&view=rev
Log:
Cleaned up Junit test output, recatorgorized several junit tests.
Added:
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetInheritanceTest.java (contents, props changed)
- copied, changed from r417867, beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventSetInheritanceTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventsetAptTest.java (contents, props changed)
- copied, changed from r413714, beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventsetAptTest.java
Removed:
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventSetInheritanceTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventsetAptTest.java
Modified:
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/assembly/AssemblyTestAssembler.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/lifecycle/ControlLifecycleImpl.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/serialization/ControlSerializationImpl.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/DeclarativeTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleLifecycleTest.java
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/assembly/AssemblyTestAssembler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/assembly/AssemblyTestAssembler.java?rev=419621&r1=419620&r2=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/assembly/AssemblyTestAssembler.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/assembly/AssemblyTestAssembler.java Thu Jul 6 10:15:41 2006
@@ -31,19 +31,16 @@
String genPackageName = "org.apache.beehive.controls.test.assembly.generated";
String genClassName = "AssemblyTestGenerated";
-System.out.println("*** IN TEST ASSEMBLER ***");
/* Write basic class structure out for later
compiliation and then finally instantiation in a test */
try {
File dir = new File(cac.getSrcOutputDir(), genPackageName.replace(".", File.separator));
-System.out.println("*** dir = " + dir.toString());
dir.mkdirs();
FileWriter fw = new FileWriter(new File(dir, genClassName + ".java"));
fw.write("package " + genPackageName + ";" +
"public class " + genClassName + "{ }");
fw.close();
-System.out.println("** done");
}
catch (java.io.IOException ioe) {
throw new ControlAssemblyException("Error writing " +
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/lifecycle/ControlLifecycleImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/lifecycle/ControlLifecycleImpl.java?rev=419621&r1=419620&r2=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/lifecycle/ControlLifecycleImpl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/lifecycle/ControlLifecycleImpl.java Thu Jul 6 10:15:41 2006
@@ -71,14 +71,14 @@
@EventHandler(field = "_controlBeanContext", eventSet = ControlBeanContext.LifeCycle.class, eventName = "onCreate")
public void onCreate() {
- System.out.println("bean context event -- onCreate");
+ // System.out.println("bean context event -- onCreate");
checkContainerContext();
_lifecycleEventStrings.add("onCreate");
}
@EventHandler(field = "_resourceContext", eventSet = ResourceContext.ResourceEvents.class, eventName = "onAcquire")
public void onAquire() {
- System.out.println("bean context event -- onAcquire");
+ // System.out.println("bean context event -- onAcquire");
checkContainerContext();
if(!_onReleaseCalled)
@@ -90,7 +90,7 @@
@EventHandler(field = "_resourceContext", eventSet = ResourceContext.ResourceEvents.class, eventName = "onRelease")
public void onRelease() {
- System.out.println("bean context event -- onRelease");
+ // System.out.println("bean context event -- onRelease");
checkContainerContext();
_onReleaseCalled = true;
@@ -99,7 +99,7 @@
private void checkContainerContext() {
ControlContainerContext ccc = ControlThreadContext.getContext();
- System.out.println("control container context: " + (ccc != null ? ccc.hashCode() : "is null"));
+ //System.out.println("control container context: " + (ccc != null ? ccc.hashCode() : "is null"));
if(ccc == null)
throw new IllegalStateException("Control could not find a valid ControlContainerContext!");
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/serialization/ControlSerializationImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/serialization/ControlSerializationImpl.java?rev=419621&r1=419620&r2=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/serialization/ControlSerializationImpl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/serialization/ControlSerializationImpl.java Thu Jul 6 10:15:41 2006
@@ -70,7 +70,7 @@
@EventHandler(field = "_resourceContext", eventSet = ResourceContext.ResourceEvents.class, eventName = "onAcquire")
public void onAquire() {
- System.out.println("bean context event -- onAcquire : state " + _controlState + " ctrl " + this);
+ // System.out.println("bean context event -- onAcquire : state " + _controlState + " ctrl " + this);
checkContainerContext();
if(!_onReleaseCalled)
@@ -82,7 +82,7 @@
@EventHandler(field = "_resourceContext", eventSet = ResourceContext.ResourceEvents.class, eventName = "onRelease")
public void onRelease() {
- System.out.println("bean context event -- onRelease : state = " + _controlState + " ctrl " + this);
+ // System.out.println("bean context event -- onRelease : state = " + _controlState + " ctrl " + this);
checkContainerContext();
_onReleaseCalled = true;
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java?rev=419621&r1=419620&r2=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java Thu Jul 6 10:15:41 2006
@@ -55,7 +55,7 @@
assertNotNull(_lifecycleControl.getTheControlBeanContext());
assertNotNull(_lifecycleControl.getTheResourceContext());
- System.out.println(_lifecycleControl.echo("foo"));
+ //System.out.println(_lifecycleControl.echo("foo"));
List events = _lifecycleControl.getLifecycleEvents();
assertEquals(2, events.size());
assertEquals("onCreate", events.get(0));
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/DeclarativeTest.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/DeclarativeTest.java?rev=419621&r1=419620&r2=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/DeclarativeTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/DeclarativeTest.java Thu Jul 6 10:15:41 2006
@@ -100,13 +100,13 @@
* Tests outer control firing events to us
*/
public void testOuterEvents() {
- System.out.println( "_onReportMessage=" + _onReportMessage );
+ //System.out.println( "_onReportMessage=" + _onReportMessage );
assertNotNull(_outerControl);
_outerControl.fireOuterEvents("this is the reported msg");
assertEquals("this is the reported msg", _onReportMessage );
- System.out.println( "_onReportMessage=" + _onReportMessage );
+ //System.out.println( "_onReportMessage=" + _onReportMessage );
}
/**
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleLifecycleTest.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleLifecycleTest.java?rev=419621&r1=419620&r2=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleLifecycleTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleLifecycleTest.java Thu Jul 6 10:15:41 2006
@@ -36,7 +36,7 @@
assertNotNull(_lifecycleControl.getTheControlBeanContext());
assertNotNull(_lifecycleControl.getTheResourceContext());
- System.out.println(_lifecycleControl.echo("foo"));
+ //System.out.println(_lifecycleControl.echo("foo"));
List events = _lifecycleControl.getLifecycleEvents();
assertEquals(2, events.size());
assertEquals("onCreate", events.get(0));
Copied: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetInheritanceTest.java (from r417867, beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventSetInheritanceTest.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetInheritanceTest.java?p2=beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetInheritanceTest.java&p1=beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventSetInheritanceTest.java&r1=417867&r2=419621&rev=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventSetInheritanceTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetInheritanceTest.java Thu Jul 6 10:15:41 2006
@@ -16,11 +16,12 @@
* $Header:$
*/
-package org.apache.beehive.controls.test.junit;
+package org.apache.beehive.controls.test.junit.event;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.api.events.EventHandler;
import org.apache.beehive.controls.test.controls.eventsetInheritance.CtrlExt;
+import org.apache.beehive.controls.test.junit.ControlTestCase;
/**
* Junit test to verify that eventset inheritance is working correctly at both compile time and run time.
Propchange: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventsetAptTest.java (from r413714, beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventsetAptTest.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventsetAptTest.java?p2=beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventsetAptTest.java&p1=beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventsetAptTest.java&r1=413714&r2=419621&rev=419621&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/EventsetAptTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventsetAptTest.java Thu Jul 6 10:15:41 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.controls.test.junit;
+package org.apache.beehive.controls.test.junit.event;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.test.controls.eventsetApt.MulticastExt;
@@ -23,6 +23,7 @@
import org.apache.beehive.controls.test.controls.eventsetApt.NoMethodsExt;
import org.apache.beehive.controls.test.controls.eventsetControlExt.EventExt;
import org.apache.beehive.controls.test.controls.emptyeventset.EmptyEvent;
+import org.apache.beehive.controls.test.junit.ControlTestCase;
/**
* Junit tests for making sure that APT can generate controls with eventsets when
Propchange: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventsetAptTest.java
------------------------------------------------------------------------------
svn:eol-style = native