Project

General

Profile

« Previous | Next » 

Revision e6d7b501

Added by Andreas Müller almost 7 years ago

ref #6368 remove TaxonNameBase subclasses

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java
57 57
	@Before
58 58
	public void setUp() throws Exception {
59 59
		nameBase1 = new TaxonNameBaseTestClass(null,null);
60
		nameBase2 = new TaxonNameBaseTestClass(Rank.GENUS());
60
		nameBase2 = new TaxonNameBaseTestClass(Rank.GENUS(), null);
61 61
	}
62 62

  
63 63

  
64 64
	private class TaxonNameBaseTestClass extends TaxonNameBase<TaxonNameBaseTestClass, INameCacheStrategy<TaxonNameBaseTestClass>>{
65
		public TaxonNameBaseTestClass(){super(null);}
66
		public TaxonNameBaseTestClass(Rank rank){super(null, rank);}
67
		public TaxonNameBaseTestClass(HomotypicalGroup hg){super(null, hg);}
68 65
		public TaxonNameBaseTestClass(Rank rank, HomotypicalGroup hg){super(null, rank, hg);}
69 66
		@Override
70 67
		public void setCacheStrategy(INameCacheStrategy strategy){}
......
106 103
		assertNotNull(nameBase2);
107 104
		assertEquals(Rank.GENUS(), nameBase2.getRank());
108 105
		Rank rank = null;
109
		TaxonNameBase testName = new TaxonNameBaseTestClass(rank);
106
		TaxonNameBase testName = new TaxonNameBaseTestClass(rank, null);
110 107
		assertNull(testName.getRank());
111 108
	}
112 109

  
113
	/**
114
	 * Test method for {@link eu.etaxonomy.cdm.model.name.TaxonNameBase#TaxonNameBase(eu.etaxonomy.cdm.model.name.HomotypicalGroup)}.
115
	 */
116 110
	@Test
117 111
	public void testTaxonNameBaseHomotypicalGroup() {
118 112
		HomotypicalGroup hg = HomotypicalGroup.NewInstance();
119
		TaxonNameBase testHG = new TaxonNameBaseTestClass(hg);
113
		TaxonNameBase testHG = new TaxonNameBaseTestClass(null, hg);
120 114
		assertSame(hg, testHG.getHomotypicalGroup());
121 115
		HomotypicalGroup hgNull = null;
122
		TaxonNameBase testHGNull = new TaxonNameBaseTestClass(hgNull);
116
		TaxonNameBase testHGNull = new TaxonNameBaseTestClass(null, hgNull);
123 117
		assertNotNull(testHGNull.getHomotypicalGroup());
124 118
	}
125 119

  

Also available in: Unified diff