[jsword-svn] jsword/java/jswordtest/org/crosswire/jsword/passage s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/passage
In directory www.crosswire.org:/tmp/cvs-serv27888/java/jswordtest/org/crosswire/jsword/passage

Modified Files:
	VerseRangeTest.java BibleInfoTest.java 
Log Message:
Split getOSISName into getOsisRef and getOsisID, since these are different.

Index: BibleInfoTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/passage/BibleInfoTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BibleInfoTest.java	27 Jul 2005 23:25:45 -0000	1.10
--- BibleInfoTest.java	13 Aug 2005 14:41:41 -0000	1.11
***************
*** 68,80 ****
          BibleInfo.setCase(CaseType.SENTENCE);
          assertEquals(BibleInfo.getLongBookName(1), "Genesis"); //$NON-NLS-1$
!         assertEquals(BibleInfo.getLongBookName(66), "Revelation"); //$NON-NLS-1$
  
          BibleInfo.setCase(CaseType.LOWER);
          assertEquals(BibleInfo.getLongBookName(1), "genesis"); //$NON-NLS-1$
!         assertEquals(BibleInfo.getLongBookName(66), "revelation"); //$NON-NLS-1$
  
          BibleInfo.setCase(CaseType.UPPER);
          assertEquals(BibleInfo.getLongBookName(1), "GENESIS"); //$NON-NLS-1$
!         assertEquals(BibleInfo.getLongBookName(66), "REVELATION"); //$NON-NLS-1$
  
          try
--- 68,80 ----
          BibleInfo.setCase(CaseType.SENTENCE);
          assertEquals(BibleInfo.getLongBookName(1), "Genesis"); //$NON-NLS-1$
!         assertEquals(BibleInfo.getLongBookName(66), "Revelation of John"); //$NON-NLS-1$
  
          BibleInfo.setCase(CaseType.LOWER);
          assertEquals(BibleInfo.getLongBookName(1), "genesis"); //$NON-NLS-1$
!         assertEquals(BibleInfo.getLongBookName(66), "revelation of john"); //$NON-NLS-1$
  
          BibleInfo.setCase(CaseType.UPPER);
          assertEquals(BibleInfo.getLongBookName(1), "GENESIS"); //$NON-NLS-1$
!         assertEquals(BibleInfo.getLongBookName(66), "REVELATION OF JOHN"); //$NON-NLS-1$
  
          try

Index: VerseRangeTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/passage/VerseRangeTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** VerseRangeTest.java	27 Jul 2005 23:25:45 -0000	1.15
--- VerseRangeTest.java	13 Aug 2005 14:41:41 -0000	1.16
***************
*** 171,175 ****
      {
          PassageUtil.setPersistentNaming(false);
!         assertEquals(VerseRangeFactory.fromString("1corinth 8-9").toString(), "1Co 8-9"); //$NON-NLS-1$ //$NON-NLS-2$
          assertEquals(VerseRangeFactory.fromString("Genesis 1 1").toString(), "Gen 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
          assertEquals(VerseRangeFactory.fromString("g 1 1-e 1 1").toString(), "Gen 1:1-Exo 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
--- 171,175 ----
      {
          PassageUtil.setPersistentNaming(false);
!         assertEquals(VerseRangeFactory.fromString("1corinth 8-9").toString(), "1Cor 8-9"); //$NON-NLS-1$ //$NON-NLS-2$
          assertEquals(VerseRangeFactory.fromString("Genesis 1 1").toString(), "Gen 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
          assertEquals(VerseRangeFactory.fromString("g 1 1-e 1 1").toString(), "Gen 1:1-Exo 1:1"); //$NON-NLS-1$ //$NON-NLS-2$