Author: ijabz
Date: 2009-10-30 20:37:52 +0000 (Fri, 30 Oct 2009)
New Revision: 12269
Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndex.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TrackXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkXmlWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java
Log:
Fixes for Work entity
Display all constant types as lowercase in xml
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndex.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndex.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndex.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -80,7 +80,7 @@
"order by w.id,acn.position "); //Order by pos so come in expected order
addPreparedStatement("WORKS",
- "SELECT w.id as wid, w.gid, wn.name as name, lower(wt.name) as type " +
+ "SELECT w.id as wid, w.gid, wn.name as name, lower(wt.name) as type, iswc " +
"FROM work AS w " +
"LEFT JOIN work_name wn ON w.name = wn.id " +
"LEFT JOIN work_type wt ON w.type = wt.id " +
@@ -135,6 +135,7 @@
addFieldToDocument(doc, WorkIndexField.WORK_ID, rs.getString("gid"));
addFieldToDocument(doc, WorkIndexField.WORK, rs.getString("name"));
addNonEmptyFieldToDocument(doc, WorkIndexField.TYPE, rs.getString("type"));
+ addNonEmptyFieldToDocument(doc, WorkIndexField.ISWC, rs.getString("iswc"));
if (artists.containsKey(id)) {
//For each artist credit
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -34,12 +34,34 @@
Statement stmt = conn.createStatement();
+ stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
+ stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (4,'Echo And The Bunnymen',1)");
+
+ stmt.addBatch("INSERT INTO artist_alias(id, artist, name, editpending) VALUES(1,16153,2,0);");
+ stmt.addBatch("INSERT INTO artist_alias(id, artist, name, editpending) VALUES(2,16153,3,0);");
+ stmt.addBatch("INSERT INTO artist_alias(id, artist, name, editpending) VALUES(3,16153,4,0);");
+
+ stmt.addBatch("INSERT INTO artist(id,name, gid, sortname,comment, begindate_year,begindate_month,enddate_year,type,editpending)" +
+ " VALUES (16153,1, 'ccd4879c-5e88-4385-b131-bf65296bf245',2,'a comment', 1978,null, 1995, 2, 0)");
+
+ stmt.addBatch("INSERT INTO artist_credit( " +
+ " id, artistcount, refcount) " +
+ " VALUES (1, 1, 1)");
+
+ stmt.addBatch("INSERT INTO artist_credit_name(" +
+ " artist_credit, position, artist,name, joinphrase)" +
+ " VALUES (1, 0, 16153, 1, null)");
+
stmt.addBatch("INSERT INTO work(" +
" id, gid, name,artist_credit,type, iswc, comment, editpending)" +
- " VALUES (1, 'a539bb1e-f2e1-4b45-9db8-8053841e7503', 1, 1, 1, null, null, 1);");
-
+ " VALUES (1, 'a539bb1e-f2e1-4b45-9db8-8053841e7503', 1, 1, 1, 'T-101779304-1', null, 1);");
stmt.addBatch("INSERT INTO work_name(id, name, refcount) " +
"VALUES (1, 'Work', 1);");
+
stmt.addBatch("");
stmt.executeBatch();
@@ -58,7 +80,11 @@
Document doc = ir.document(0);
assertEquals(1, doc.getFields(WorkIndexField.WORK.getName()).length);
assertEquals("Work", doc.getField(WorkIndexField.WORK.getName()).stringValue());
- assertEquals(0, doc.getFields(WorkIndexField.ARTIST.getName()).length);
+ assertEquals(1, doc.getFields(WorkIndexField.ARTIST.getName()).length);
+ assertEquals("Echo & The Bunnymen", doc.getField(WorkIndexField.ARTIST.getName()).stringValue());
+ assertEquals(1, doc.getFields(WorkIndexField.ISWC.getName()).length);
+ assertEquals("T-101779304-1", doc.getField(WorkIndexField.ISWC.getName()).stringValue());
+
}
ir.close();
}
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -13,9 +13,10 @@
search.put(ResourceType.RELEASE, new ReleaseSearch(indexDir));
search.put(ResourceType.RELEASE_GROUP, new ReleaseGroupSearch(indexDir));
search.put(ResourceType.TRACK, new TrackSearch(indexDir));
+ search.put(ResourceType.WORK, new WorkSearch(indexDir));
+ search.put(ResourceType.ANNOTATION, new AnnotationSearch(indexDir));
search.put(ResourceType.FREEDB, new FreeDBSearch(indexDir));
search.put(ResourceType.CDSTUB, new CDStubSearch(indexDir));
- search.put(ResourceType.ANNOTATION, new AnnotationSearch(indexDir));
}
/**
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistXmlWriter.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistXmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -39,6 +39,7 @@
import java.io.IOException;
import java.math.BigInteger;
+import java.util.Locale;
public class ArtistXmlWriter extends XmlWriter {
@@ -59,7 +60,7 @@
String artype = doc.get(ArtistIndexField.TYPE);
if (artype != null) {
- artist.setType(StringUtils.capitalize(artype));
+ artist.setType(artype.toLowerCase(Locale.US));
}
@@ -69,7 +70,7 @@
String gender = doc.get(ArtistIndexField.GENDER);
if (gender != null) {
- artist.setGender(StringUtils.capitalize(gender));
+ artist.setGender(gender.toLowerCase(Locale.US));
}
@@ -77,7 +78,7 @@
String country = doc.get(ArtistIndexField.COUNTRY);
if (country != null) {
- artist.setCountry(StringUtils.upperCase(country));
+ artist.setCountry(country.toLowerCase(Locale.US));
}
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelXmlWriter.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelXmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.math.BigInteger;
+import java.util.Locale;
public class LabelXmlWriter extends XmlWriter {
@@ -51,8 +52,10 @@
MbDocument doc = result.doc;
Label label = of.createLabel();
label.setId(doc.get(LabelIndexField.LABEL_ID));
- label.setType(StringUtils.capitalize(doc.get(LabelIndexField.TYPE)));
-
+ String type = doc.get(LabelIndexField.TYPE);
+ if(type!=null) {
+ label.setType(type.toLowerCase((Locale.US)));
+ }
label.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
String name = doc.get(LabelIndexField.LABEL);
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.math.BigInteger;
+import java.util.Locale;
public class ReleaseGroupXmlWriter extends XmlWriter {
@@ -63,10 +64,10 @@
}
String type = doc.get(ReleaseGroupIndexField.TYPE);
- if (type != null) {
- releaseGroup.getType().add(StringUtils.capitalize(type));
+ if(type!=null) {
+ releaseGroup.getType().add(type.toLowerCase((Locale.US)));
}
-
+
String[] artistIds = doc.getValues(ReleaseGroupIndexField.ARTIST_ID);
String[] artistNames = doc.getValues(ReleaseGroupIndexField.ARTIST_NAME);
String[] artistJoinPhrases = doc.getValues(ReleaseGroupIndexField.ARTIST_JOINPHRASE);
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseXmlWriter.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseXmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -65,17 +65,17 @@
ReleaseGroup rg = of.createReleaseGroup();
release.setReleaseGroup(rg);
if (type != null) {
- release.getReleaseGroup().getType().add(StringUtils.capitalize(type));
+ release.getReleaseGroup().getType().add(type.toLowerCase(Locale.US));
}
String status = doc.get(ReleaseIndexField.STATUS);
if (status != null) {
- release.setStatus(status);
+ release.setStatus(status.toLowerCase(Locale.US));
}
String country = doc.get(ReleaseIndexField.COUNTRY);
if (country != null) {
- release.setCountry(StringUtils.upperCase(country));
+ release.setCountry(country.toLowerCase(Locale.US));
}
String date = doc.get(ReleaseIndexField.DATE);
@@ -99,12 +99,12 @@
TextRepresentation tr = of.createTextRepresentation();
String script = doc.get(ReleaseIndexField.SCRIPT);
if (script != null) {
- tr.setScript(script);
+ tr.setScript(script.toLowerCase(Locale.US));
}
String lang = doc.get(ReleaseIndexField.LANGUAGE);
if (lang != null) {
- tr.setLanguage(lang.toUpperCase(Locale.US));
+ tr.setLanguage(lang.toLowerCase(Locale.US));
}
if (script != null || lang != null) {
@@ -165,7 +165,7 @@
for (int i = 0; i < formats.length; i++) {
Medium medium = of.createMedium();
- medium.setFormat(formats[i]);
+ medium.setFormat(formats[i].toLowerCase(Locale.US));
TrackList trackList = of.createTrackList();
trackList.setCount(BigInteger.valueOf(NumericUtils.prefixCodedToInt(numTracks[i])));
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TrackXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TrackXmlWriter.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TrackXmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -39,6 +39,7 @@
import java.io.IOException;
import java.math.BigInteger;
+import java.util.Locale;
public class TrackXmlWriter extends XmlWriter {
@@ -112,7 +113,7 @@
ReleaseGroup rg = of.createReleaseGroup();
release.setReleaseGroup(rg);
if (!releaseTypes[i].equals("-")) {
- release.getReleaseGroup().getType().add(StringUtils.capitalize(releaseTypes[i]));
+ release.getReleaseGroup().getType().add(releaseTypes[i].toLowerCase(Locale.US));
}
TrackList releaseTrackList = of.createTrackList();
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkXmlWriter.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkXmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -39,6 +39,7 @@
import java.io.IOException;
import java.math.BigInteger;
+import java.util.Locale;
public class WorkXmlWriter extends XmlWriter {
@@ -64,7 +65,7 @@
String type = doc.get(WorkIndexField.TYPE);
if (type != null) {
- work.setType(StringUtils.capitalize(type));
+ work.setType(type.toLowerCase(Locale.US));
}
String iswc = doc.get(WorkIndexField.ISWC);
@@ -73,15 +74,14 @@
}
- String[] artistIds = doc.getValues(ReleaseGroupIndexField.ARTIST_ID);
- String[] artistNames = doc.getValues(ReleaseGroupIndexField.ARTIST_NAME);
- String[] artistJoinPhrases = doc.getValues(ReleaseGroupIndexField.ARTIST_JOINPHRASE);
- String[] artistSortNames = doc.getValues(ReleaseGroupIndexField.ARTIST_SORTNAME);
- String[] artistCreditNames = doc.getValues(ReleaseGroupIndexField.ARTIST_NAMECREDIT);
+ String[] artistIds = doc.getValues(WorkIndexField.ARTIST_ID);
+ String[] artistNames = doc.getValues(WorkIndexField.ARTIST_NAME);
+ String[] artistJoinPhrases = doc.getValues(WorkIndexField.ARTIST_JOINPHRASE);
+ String[] artistSortNames = doc.getValues(WorkIndexField.ARTIST_SORTNAME);
+ String[] artistCreditNames = doc.getValues(WorkIndexField.ARTIST_NAMECREDIT);
ArtistCredit ac = of.createArtistCredit();
for (int i = 0; i < artistIds.length; i++) {
-
Artist artist = of.createArtist();
artist.setId(artistIds[i]);
artist.setName(artistNames[i]);
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -307,12 +307,12 @@
//assertTrue(output.contains("<artist-list count=\"1\" offset=\"0\">")); offset comes before count in output
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
- assertTrue(output.contains("type=\"Group\""));
+ assertTrue(output.contains("type=\"group\""));
assertTrue(output.contains("<name>Farming Incident</name>"));
assertTrue(output.contains("<sort-name>Farming Incident</sort-name>"));
assertTrue(output.contains("<life-span><begin>1999-04</begin></life-span>"));
- assertTrue(output.contains("<country>AF</country>"));
- assertTrue(output.contains("<gender>Male</gender>"));
+ assertTrue(output.contains("<country>af</country>"));
+ assertTrue(output.contains("<gender>male</gender>"));
assertFalse(output.contains("alias"));
assertFalse(output.contains("disambugation"));
}
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -288,7 +288,7 @@
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("id=\"ff571ff4-04cb-4b9c-8a1c-354c330f863c\""));
- assertTrue(output.contains("type=\"Production\""));
+ assertTrue(output.contains("type=\"production\""));
assertTrue(output.contains("<name>Jockey Slut</name>"));
assertTrue(output.contains("<sort-name>Slut, Jockey</sort-name>"));
assertTrue(output.contains("<begin>1993</begin"));
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -298,7 +298,7 @@
assertTrue(output.contains("<name-credit>"));
assertTrue(output.contains("<artist-credit>"));
assertTrue(output.contains("artist id=\"707622da-475f-48e1-905d-248718df6521\""));
- assertTrue(output.contains("type=\"Single\""));
+ assertTrue(output.contains("type=\"single\""));
assertTrue(output.contains("release-list count=\"1\""));
@@ -350,7 +350,7 @@
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("id=\"0011c128-b1f2-300e-88cc-c33c30dce704\""));
- assertTrue(output.contains("type=\"Album\""));
+ assertTrue(output.contains("type=\"album\""));
assertTrue(output.contains("<title>Epics</title>"));
assertTrue(output.contains("<name-credit joinphrase=\"and\">"));
assertTrue(output.contains("<name>Erich Kunzel</name>"));
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -554,9 +554,9 @@
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("id=\"1d9e8ed6-3893-4d3b-aa7d-6cd79609e386\""));
- assertTrue(output.contains("<language>ENG</language>"));
- assertTrue(output.contains("<script>Latn</script>"));
- assertTrue(output.contains("<release-group type=\"Album\""));
+ assertTrue(output.contains("<language>eng</language>"));
+ assertTrue(output.contains("<script>latn</script>"));
+ assertTrue(output.contains("<release-group type=\"album\""));
assertTrue(output.contains("<title>Our Glorious 5 Year Plan</title>"));
assertTrue(output.contains("<name>Farming Incident</name>"));
assertTrue(output.contains("<sort-name>Incident, Farming</sort-name>"));
@@ -564,8 +564,8 @@
assertTrue(output.contains("<disc-list count=\"1\""));
assertTrue(output.contains("<track-list count=\"10\""));
assertTrue(output.contains("<date>2005</date>"));
- assertTrue(output.contains("<country>GB</country>"));
- assertTrue(output.contains("<format>Vinyl</format>"));
+ assertTrue(output.contains("<country>gb</country>"));
+ assertTrue(output.contains("<format>vinyl</format>"));
assertTrue(output.contains("<asin>07599273202</asin>"));
assertTrue(output.contains("<label><name>Wrath Records</name></label>"));
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -332,7 +332,7 @@
assertTrue(output.contains("<name>Farming Incident</name>"));
assertTrue(output.contains("<sort-name>Incident, Farming</sort-name>"));
assertTrue(output.contains("release id=\"1d9e8ed6-3893-4d3b-aa7d-6cd79609e386\""));
- assertTrue(output.contains("release-group type=\"Album\""));
+ assertTrue(output.contains("release-group type=\"album\""));
assertTrue(output.contains("track-list offset=\"4\""));
assertTrue(output.contains("count=\"10\""));
assertTrue(output.contains("offset=\"0\""));
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java 2009-10-30 14:20:44 UTC (rev 12268)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java 2009-10-30 20:37:52 UTC (rev 12269)
@@ -47,6 +47,14 @@
Document doc = new Document();
Index.addFieldToDocument(doc, WorkIndexField.WORK_ID, "4ff89cf0-86af-11de-90ed-001fc6f176ff");
Index.addFieldToDocument(doc, WorkIndexField.WORK, "Symphony No. 5");
+ Index.addFieldToDocument(doc, WorkIndexField.ISWC,"T-101779304-1");
+ Index.addFieldToDocument(doc, WorkIndexField.ARTIST_ID, "1f9df192-a621-4f54-8850-2c5373b7eac9");
+ Index.addFieldToDocument(doc, WorkIndexField.ARTIST, "Ludwig van Beethoven");
+ Index.addFieldToDocument(doc, WorkIndexField.ARTIST_NAME, "Ludwig van Beethoven");
+ Index.addFieldToDocument(doc, WorkIndexField.ARTIST_NAMECREDIT, "Ludwig van Beethoven");
+ Index.addFieldToDocument(doc, WorkIndexField.ARTIST_SORTNAME, "Beethoven, Ludwig van");
+ Index.addFieldToDocument(doc, WorkIndexField.ARTIST_JOINPHRASE, "-");
+
writer.addDocument(doc);
}
writer.close();
@@ -91,5 +99,10 @@
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("id=\"4ff89cf0-86af-11de-90ed-001fc6f176ff\""));
assertTrue(output.contains("<title>Symphony No. 5</title>"));
+ assertTrue(output.contains("<name>Ludwig van Beethoven</name>"));
+ assertTrue(output.contains("<sort-name>Beethoven, Ludwig van</sort-name>"));
+ assertTrue(output.contains("<iswc>T-101779304-1</iswc>"));
+
+
}
}
\ No newline at end of file
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
