[testedby-commit] [testedby] r189 committed - fixing some regressions

[test...@googlecode.com]

Revision: 189
Author: maestri.stefano
Date: Tue Apr 20 00:15:08 2010
Log: fixing some regressions
http://code.google.com/p/testedby/source/detail?r=189

Modified:
/trunk/pom.xml
/trunk/src/main/java/it/javalinux/testedby/metadata/ClassLinkMetadata.java
/trunk/src/test/java/it/javalinux/testedby/runner/TestRunnerTest.java

/trunk/src/test/java/it/javalinux/testedby/runner/impl/JunitTestRunnerTest.java
/trunk/src/test/java/it/javalinux/testedby/testsupport/TestClassOne.java

=======================================
--- /trunk/pom.xml Sat Dec 12 17:08:45 2009
+++ /trunk/pom.xml Tue Apr 20 00:15:08 2010
@@ -66,6 +66,9 @@
</goals>
<configuration>
<skip>false</skip>
+ <excludes>
+ <exclude>**/testsupport/**</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
=======================================
---
/trunk/src/main/java/it/javalinux/testedby/metadata/ClassLinkMetadata.java
Mon Apr 19 13:49:21 2010
+++
/trunk/src/main/java/it/javalinux/testedby/metadata/ClassLinkMetadata.java
Tue Apr 20 00:15:08 2010
@@ -83,7 +83,6 @@
final int prime = 31;
int result = 1;
result = prime * result + ((clazz == null) ? 0 : clazz.hashCode());
- result = prime * result + ((status == null) ? 0 : status.hashCode());
return result;
}

@@ -106,11 +105,6 @@
return false;
} else if (!clazz.equals(other.clazz))
return false;
- if (status == null) {
- if (other.status != null)
- return false;
- } else if (!status.equals(other.status))
- return false;
return true;
}

=======================================
--- /trunk/src/test/java/it/javalinux/testedby/runner/TestRunnerTest.java
Sun Nov 29 06:08:23 2009
+++ /trunk/src/test/java/it/javalinux/testedby/runner/TestRunnerTest.java
Tue Apr 20 00:15:08 2010
@@ -20,68 +20,28 @@
*/
package it.javalinux.testedby.runner;

-import static org.hamcrest.core.IsEqual.equalTo;
-
-import static org.mockito.Matchers.eq;
-
-import static org.mockito.Mockito.mock;
-
-import static org.junit.Assert.fail;
-
-import static org.mockito.Mockito.times;
-
-import static org.mockito.Mockito.verify;
-
-import static org.mockito.Matchers.anyObject;
-
-import static org.hamcrest.core.IsAnything.any;
-
-import static org.hamcrest.core.IsAnything.anything;
-
-import static org.mockito.Matchers.anyCollection;
-
-import static org.mockito.Matchers.anyString;
-
-import static org.mockito.Mockito.when;
-
-import static org.mockito.Mockito.spy;
-
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.junit.matchers.JUnitMatchers.hasItem;

-import it.javalinux.testedby.instrumentation.InstrumentationTest;
import it.javalinux.testedby.instrumentation.InstrumentationTestRunner;
import it.javalinux.testedby.metadata.ClassLinkMetadata;
import it.javalinux.testedby.metadata.MethodLinkMetadata;
-import it.javalinux.testedby.metadata.MethodMetadata;
import it.javalinux.testedby.metadata.StatusMetadata;
import it.javalinux.testedby.metadata.TestsMetadata;
-import
it.javalinux.testedby.metadata.builder.annotations.AnnotationBasedMetadataBuilder;
-import
it.javalinux.testedby.metadata.builder.instrumentation.InstrumentationBasedMetadataBuilder;
import it.javalinux.testedby.metadata.impl.ImmutableMethodMetadata;
import it.javalinux.testedby.metadata.impl.MetadataRepository;
import it.javalinux.testedby.runner.impl.JunitTestRunner;
-import it.javalinux.testedby.testsupport.ClassExtendingAbstractClass;
-import it.javalinux.testedby.testsupport.TestClassOne;
-import it.javalinux.testedby.testsupport.TestClassTwo;
import it.javalinux.testedby.testsupport.instrumentation.Foo;
import it.javalinux.testedby.testsupport.instrumentation.SampleTest;
-import
it.javalinux.testedby.testsupport.interfaces.AbstractClassClassExtendingInterfaceUnderTestWithAddedAnnotations;
-import it.javalinux.testedby.testsupport.interfaces.InterfaceUnderTestOne;
-import
it.javalinux.testedby.testsupport.interfaces.TestClassOnInterfaceOne;
-import
it.javalinux.testedby.testsupport.interfaces.TestClassOnInterfaceTwo;

import java.io.BufferedReader;
import java.io.File;
import java.io.FilenameFilter;
import java.io.InputStreamReader;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
import java.util.logging.Logger;

import javassist.ClassPool;
@@ -114,6 +74,9 @@

private final static ClassLinkMetadata InterfaceUnderTestOne_METADATA
= new
ClassLinkMetadata(status, "it.javalinux.testedby.testsupport.InterfaceUnderTestOne");

+ public TestRunnerTest() {
+
+ }
@Test
public void
runningWithoutInstrumentationAndWithoutAnnotationShouldResultInNoMetadata()
throws Exception {
InstrumentationTestRunner runner = new JunitTestRunner();
@@ -127,7 +90,7 @@
@Test
public void shouldInstrumentClassesAndMethods() throws Exception {

- String command = "java -Xbootclasspath/a:" + getOwnJarPath() + ":" +
getJUnitJarPath() + ":" + getJavassistJarPath() + " -javaagent:" +
getOwnJarPath() + " -cp " + getTestClassesDir().getPath() + " " +
this.getClass().getCanonicalName();
+ String command = "java -Xbootclasspath/a:" + getOwnJarPath() + ":" +
getJUnitJarPath() + ":" + getJavassistJarPath() + " -javaagent:" +
getOwnJarPath() + " -cp " + getTestClassesDir().getPath() + " " +
TestRunnerTest.class.getCanonicalName();
Process p = Runtime.getRuntime().exec(command);
int res = p.waitFor();

=======================================
---
/trunk/src/test/java/it/javalinux/testedby/runner/impl/JunitTestRunnerTest.java
Mon Apr 19 13:49:21 2010
+++
/trunk/src/test/java/it/javalinux/testedby/runner/impl/JunitTestRunnerTest.java
Tue Apr 20 00:15:08 2010
@@ -44,6 +44,7 @@
import it.javalinux.testedby.runner.impl.JunitTestRunner;
import it.javalinux.testedby.testsupport.ClassExtendingAbstractClass;
import it.javalinux.testedby.testsupport.TestClassOne;
+import it.javalinux.testedby.testsupport.TestClassThree;
import it.javalinux.testedby.testsupport.TestClassTwo;
import
it.javalinux.testedby.testsupport.interfaces.AbstractClassClassExtendingInterfaceUnderTestWithAddedAnnotations;
import it.javalinux.testedby.testsupport.interfaces.InterfaceUnderTestOne;
@@ -67,11 +68,11 @@

private final static StatusMetadata statusInstrumentation = new
StatusMetadata().setFromAnnotation(false).setValid(true).setJustCreated(true).setOnAbstract(false);

- private final static ClassLinkMetadata CLASS_UNDERTEST_ONE_METADATA =
new
ClassLinkMetadata(status, "it.javalinux.testedby.testsupport.ClassUnderTestOneAnnotationOnMethod");
-
- private final static ClassLinkMetadata CLASS_UNDERTEST_TWO_METADATA =
new
ClassLinkMetadata(status, "it.javalinux.testedby.testsupport.ClassUnderTestOneAnnotationOnClass");
-
- private final static ClassLinkMetadata
CLASS_UNDERTEST_INSTRUMENTATION_METADATA = new
ClassLinkMetadata(statusInstrumentation, "it.javalinux.testedby.testsupport.ClassUnderTestOneAnnotationOnClass");
+ private final static ClassLinkMetadata CLASS_UNDERTEST_ONE_METADATA =
new
ClassLinkMetadata(status, "it.javalinux.testedby.testsupport.ClassUnderTestThreeAnnotationOnMethod");
+
+ private final static ClassLinkMetadata CLASS_UNDERTEST_TWO_METADATA =
new
ClassLinkMetadata(status, "it.javalinux.testedby.testsupport.ClassUnderTestThreeAnnotationOnClass");
+
+ private final static ClassLinkMetadata
CLASS_UNDERTEST_INSTRUMENTATION_METADATA = new
ClassLinkMetadata(statusInstrumentation, "it.javalinux.testedby.testsupport.ClassUnderTestTwoAnnotationOnClass");

private static InvocationTracker tracker;

@@ -123,10 +124,10 @@
}

@Test
- public void shouldReturnTrueIfAtLeasetOneTestDoesntPass() {
+ public void shouldReturnFalseIfAtLeasetOneTestDoesntPass() {
JunitTestRunner runner = new JunitTestRunner();

- boolean result =
runner.runTest(TestClassOne.class.getCanonicalName(), "testMethodOne",
CLASS_UNDERTEST_ONE_METADATA, CLASS_UNDERTEST_TWO_METADATA);
+ boolean result =
runner.runTest(TestClassThree.class.getCanonicalName(), "testMethodOne",
CLASS_UNDERTEST_ONE_METADATA, CLASS_UNDERTEST_TWO_METADATA);
assertThat(result, is(false));
}

@@ -139,10 +140,10 @@
}

@Test
- public void shouldReturnTrueIfSingleTestMethodDoesntPass() {
+ public void shouldReturnFalseIfSingleTestMethodDoesntPass() {
JunitTestRunner runner = new JunitTestRunner();

- boolean result =
runner.runTest(TestClassOne.class.getCanonicalName(), "testMethodOne");
+ boolean result =
runner.runTest(TestClassThree.class.getCanonicalName(), "testMethodOne");
assertThat(result, is(false));
}

=======================================
---
/trunk/src/test/java/it/javalinux/testedby/testsupport/TestClassOne.java
Wed Apr 14 09:27:29 2010
+++
/trunk/src/test/java/it/javalinux/testedby/testsupport/TestClassOne.java
Tue Apr 20 00:15:08 2010
@@ -33,7 +33,7 @@

@Test
public void testMethodOne() {
- fail();
+
}

@Test

--
You received this message because you are subscribed to the Google Groups "testedby-commit" group.
To post to this group, send email to testedb...@googlegroups.com.
To unsubscribe from this group, send email to testedby-comm...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/testedby-commit?hl=en.