Skip to content

Commit af94848

Browse files
committed
Modify many test classes to avoid being considered by JUnit
1 parent b31bb56 commit af94848

21 files changed

+66
-85
lines changed

app/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@ sourceSets {
195195
}
196196
}
197197

198+
test {
199+
// Test classes not meant for Junit
200+
exclude '**/org/audiveris/omr/jaxb/basic/**'
201+
exclude '**/org/audiveris/omr/jaxb/facade/**'
202+
}
203+
198204
//-------
199205
// Tasks
200206
//-------

app/src/test/java/org/audiveris/omr/image/MedianGrayFilterTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package org.audiveris.omr.image;
2323

2424
import static org.junit.Assert.fail;
25-
2625
import org.junit.Ignore;
2726
import org.junit.Test;
2827

@@ -48,7 +47,7 @@ public MedianGrayFilterTest ()
4847
{
4948
}
5049

51-
// @Test
50+
@Test
5251
public void testProcess_black_1 ()
5352
{
5453
System.out.println("\nprocess_black_1");

app/src/test/java/org/audiveris/omr/jai/TiffSplit.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

app/src/test/java/org/audiveris/omr/jaxb/facade/MyClass.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.audiveris.omr.util.Jaxb;
2525

26+
import org.junit.Ignore;
27+
2628
import java.awt.Point;
2729
import java.awt.Rectangle;
2830
import java.util.Map;
@@ -42,6 +44,7 @@
4244
*
4345
* @author Hervé Bitteur
4446
*/
47+
@Ignore
4548
@XmlRootElement
4649
@XmlAccessorType(XmlAccessType.NONE)
4750
public class MyClass

app/src/test/java/org/audiveris/omr/jaxb/facade/package-info.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@XmlJavaTypeAdapters({
2-
@XmlJavaTypeAdapter(value = Jaxb.PointAdapter.class, type = Point.class),
3-
@XmlJavaTypeAdapter(value = Jaxb.RectangleAdapter.class, type = Rectangle.class)
4-
})
1+
@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(value = Jaxb.PointAdapter.class, type = Point.class),
2+
@XmlJavaTypeAdapter(value = Jaxb.RectangleAdapter.class, type = Rectangle.class) })
53
package org.audiveris.omr.jaxb.facade;
64

75
import org.audiveris.omr.util.Jaxb;

app/src/test/java/org/audiveris/omr/jaxb/itf/MyAbstractEntity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.audiveris.omr.util.Jaxb;
2525

26+
import org.junit.Ignore;
27+
2628
import javax.xml.bind.annotation.XmlAccessType;
2729
import javax.xml.bind.annotation.XmlAccessorType;
2830
import javax.xml.bind.annotation.XmlAttribute;
@@ -35,6 +37,7 @@
3537
*
3638
* @author Hervé Bitteur
3739
*/
40+
@Ignore
3841
@XmlAccessorType(XmlAccessType.NONE)
3942
@XmlRootElement(name = "entity")
4043
public class MyAbstractEntity

app/src/test/java/org/audiveris/omr/jaxb/itf/MyBasicIndex.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.audiveris.omr.util.Jaxb;
2525

26+
import org.junit.Ignore;
27+
2628
import java.util.ArrayList;
2729
import java.util.Collection;
2830
import java.util.concurrent.ConcurrentHashMap;
@@ -41,6 +43,7 @@
4143
* @author Hervé Bitteur
4244
* @param <E>
4345
*/
46+
@Ignore
4447
@XmlRootElement
4548
public class MyBasicIndex<E extends MyEntity>
4649
{
@@ -120,12 +123,11 @@ public String toString ()
120123
*
121124
* @param <E> the specific entity type
122125
*/
126+
@Ignore
123127
private static class Snap<E extends MyAbstractEntity>
124128
{
125-
@XmlElements({
126-
@XmlElement(name = "glyph", type = MyGlyph.class),
127-
@XmlElement(name = "symbol", type = MySymbol.class)
128-
})
129+
@XmlElements({ @XmlElement(name = "glyph", type = MyGlyph.class),
130+
@XmlElement(name = "symbol", type = MySymbol.class) })
129131
ArrayList<E> list; // Flat list of entities (each with its embedded id)
130132
}
131133

@@ -135,12 +137,13 @@ private static class Snap<E extends MyAbstractEntity>
135137
*
136138
* @param <E> the specific entity type
137139
*/
140+
@Ignore
138141
private static class HashMapAdapter<E extends MyAbstractEntity>
139142
extends XmlAdapter<Snap<E>, ConcurrentHashMap<Integer, E>>
140143
{
141144
@Override
142145
public Snap<E> marshal (ConcurrentHashMap<Integer, E> map)
143-
throws Exception
146+
throws Exception
144147
{
145148
Snap<E> snap = new Snap<E>();
146149
snap.list = new ArrayList<E>(map.values());
@@ -150,7 +153,7 @@ public Snap<E> marshal (ConcurrentHashMap<Integer, E> map)
150153

151154
@Override
152155
public ConcurrentHashMap<Integer, E> unmarshal (Snap<E> snap)
153-
throws Exception
156+
throws Exception
154157
{
155158
ConcurrentHashMap<Integer, E> map = new ConcurrentHashMap<Integer, E>();
156159

app/src/test/java/org/audiveris/omr/jaxb/itf/MyCompound.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
// </editor-fold>
2222
package org.audiveris.omr.jaxb.itf;
2323

24+
import org.junit.Ignore;
25+
2426
import javax.xml.bind.annotation.XmlAccessType;
2527
import javax.xml.bind.annotation.XmlAccessorType;
2628
import javax.xml.bind.annotation.XmlIDREF;
@@ -31,6 +33,7 @@
3133
*
3234
* @author Hervé Bitteur
3335
*/
36+
@Ignore
3437
@XmlRootElement
3538
@XmlAccessorType(XmlAccessType.FIELD)
3639
public class MyCompound

app/src/test/java/org/audiveris/omr/jaxb/itf/MyEntity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@
2121
// </editor-fold>
2222
package org.audiveris.omr.jaxb.itf;
2323

24+
import org.junit.Ignore;
25+
2426
/**
2527
* Interface <code>MyEntity</code>
2628
*
2729
* @author Hervé Bitteur
2830
*/
31+
@Ignore
2932
public interface MyEntity
3033
{
3134
/**

app/src/test/java/org/audiveris/omr/jaxb/itf/MyGlyph.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
// </editor-fold>
2222
package org.audiveris.omr.jaxb.itf;
2323

24+
import org.junit.Ignore;
25+
2426
import javax.xml.bind.annotation.XmlAccessType;
2527
import javax.xml.bind.annotation.XmlAccessorType;
2628
import javax.xml.bind.annotation.XmlAttribute;
@@ -30,6 +32,7 @@
3032
*
3133
* @author Hervé Bitteur
3234
*/
35+
@Ignore
3336
@XmlAccessorType(XmlAccessType.NONE)
3437
public class MyGlyph
3538
extends MyAbstractEntity

0 commit comments

Comments
 (0)