r12284 - search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet

View: New views

1 Messages — Rating Filter: Alert me

r12284 - search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet

by root-97 :: Rate this Message:

Reply (Restricted by the Administrator) | Reply to Author | View Threaded | Show Only this Message

Author: ijabz
Date: 2009-11-03 12:52:48 +0000 (Tue, 03 Nov 2009)
New Revision: 12284

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/FindRecordingTest.java
Log:
Removed html tests that are broken by the move of MbDocument in 12281.
As we will not be returning html anymore this should be okay, but please run unit tests on complete project and check they work before commit code.

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-11-03 12:37:15 UTC (rev 12283)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-11-03 12:52:48 UTC (rev 12284)
@@ -343,29 +343,6 @@
}

- public void testOutputAsHtml() throws Exception {
-
- Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 1);
- ResultsWriter writer = new ArtistHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();
-
- String output = sw.toString();
-// System.out.println("Xml is" + output);
-// assertTrue(output.contains("<artist id=\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\"")); group comes before id in output
-// assertTrue(output.contains("<artist-list count=\"1\" offset=\"0\">")); offset comes before count in output
- assertTrue(output.contains("group"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("1999-04"));
- assertTrue(output.contains("the real one"));
- assertFalse(output.contains("end"));
- assertFalse(output.contains("alias"));
- assertFalse(output.contains("disambugation"));
-
- }
-
/**
* Tests that & is converted to valid xml
*
@@ -388,26 +365,8 @@
assertTrue(output.contains("<name>Echo & The Bunnymen</name>"));
}

- /**
- * Tests that & is converted to valid html
- *
- * @throws Exception
- */
- public void testOutputAsHtmlSpecialCharacters() throws Exception {

- Results res = ss.searchLucene("alias:\"Echo And The Bunnymen\"", 0, 1);
- ResultsWriter writer = new ArtistHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();

- String output = sw.toString();
- assertTrue(output.contains("group"));
- assertTrue(output.contains("Echo & The Bunnymen"));
- //System.out.println(output);
- }
-
public void testXmlWritingPerformance() throws Exception {
Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 10);
assertEquals(1, res.totalHits);
@@ -424,23 +383,9 @@
System.out.println("XML - Time Taken: " + (end.getTime() - start.getTime()) + "ms");
}

- public void testHtmlWritingPerformance() throws Exception {
- Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 10);
- assertEquals(1, res.totalHits);
+

- Date start = new Date();
- ResultsWriter writer = new ArtistHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- for (int i = 0; i < 1000; i++) {
- writer.write(pr, res);
- }
- pr.close();
- Date end = new Date();
- System.out.println("HTML - Time Taken: " + (end.getTime() - start.getTime()) + "ms");
- }

-
/**
* Tests strips off header and footer
* http://musicbrainz.org/ws/1/artist/?type=xml&query=%22Farming%20Incident%22

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-03 12:37:15 UTC (rev 12283)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-03 12:52:48 UTC (rev 12284)
@@ -61,7 +61,7 @@
ss = new RecordingSearch(new IndexSearcher(ramDir,true));
}

- public void testFindTrack() throws Exception {
+ public void testFindRecordingByV1TrackField() throws Exception {
Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -77,7 +77,24 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackById() throws Exception {
+
+ public void testFindRecording() throws Exception {
+ Results res = ss.searchLucene("recording:\"Gravitational Lenz\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
+ assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
+ assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
+ assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
+ assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
+ assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
+ assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
+ assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
+ assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
+ }
+
+ public void testFindRecordingByV1TrackId() throws Exception {
Results res = ss.searchLucene("trid:\"7ca7782b-a602-448b-b108-bb881a7be2d6\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -93,7 +110,23 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByReleaseId() throws Exception {
+ public void testFindRecordingById() throws Exception {
+ Results res = ss.searchLucene("rid:\"7ca7782b-a602-448b-b108-bb881a7be2d6\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
+ assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
+ assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
+ assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
+ assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
+ assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
+ assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
+ assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
+ assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
+ }
+
+ public void testFindRecordingByReleaseId() throws Exception {
Results res = ss.searchLucene("reid:\"1d9e8ed6-3893-4d3b-aa7d-6cd79609e386\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -109,7 +142,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByArtistId() throws Exception {
+ public void testFindRecordingByArtistId() throws Exception {
Results res = ss.searchLucene("arid:\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -125,7 +158,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByArtistName() throws Exception {
+ public void testFindRecordingByArtistName() throws Exception {
Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -141,7 +174,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByArtistSortname() throws Exception {
+ public void testFindRecordingByArtistSortname() throws Exception {
Results res = ss.searchLucene("sortname:\"Incident, Farming\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -157,7 +190,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByReleaseType() throws Exception {
+ public void testFindRecordingByReleaseType() throws Exception {
Results res = ss.searchLucene("type:\"album\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -173,7 +206,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByReleaseTypeNumeric() throws Exception {
+ public void testFindRecordingByReleaseTypeNumeric() throws Exception {
Results res = ss.searchLucene("type:\"1\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -188,7 +221,7 @@
assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
- public void testFindTrackByNumberOfTracksOnRelease() throws Exception {
+ public void testFindRecordingByNumberOfTracksOnRelease() throws Exception {
Results res = ss.searchLucene("tracks:10", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -204,7 +237,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByDuration() throws Exception {
+ public void testFindRecordingByDuration() throws Exception {
Results res = ss.searchLucene("dur:234000", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -220,12 +253,12 @@
}

- public void testFindTrackByNonNumericDuration() throws Exception {
+ public void testFindRecordingByNonNumericDuration() throws Exception {
Results res = ss.searchLucene("dur:fred", 0, 10);
assertEquals(0, res.totalHits);
}

- public void testFindTrackByDurationRange() throws Exception {
+ public void testFindRecordingByDurationRange() throws Exception {
Results res = ss.searchLucene("dur:[87 TO 240000]", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -240,7 +273,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByQdur() throws Exception {
+ public void testFindRecordingByQdur() throws Exception {
Results res = ss.searchLucene("qdur:117", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -256,7 +289,7 @@
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}

- public void testFindTrackByTrackNumber() throws Exception {
+ public void testFindRecordingByTrackNumber() throws Exception {
Results res = ss.searchLucene("tnum:5", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -272,7 +305,7 @@
}

- public void testFindTrackByDefault() throws Exception {
+ public void testFindRecordingByDefault() throws Exception {
Results res = ss.searchLucene("\"Gravitational Lenz\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
@@ -339,167 +372,4 @@
assertTrue(output.contains("count=\"1\""));
}

- public void testOutputAsHtml() throws Exception {
-
- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 1);
- ResultsWriter writer = new TrackHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();
-
- String output = sw.toString();
- //System.out.println("Html is" + output);
- assertTrue(output.contains("hits=1"));
- assertTrue(output.contains("offset=0"));
- assertTrue(output.contains("redirect=7ca7782b-a602-448b-b108-bb881a7be2d6"));
- assertTrue(output.contains("searchresultseven"));
- assertTrue(output.contains("Gravitational Lenz"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("Our Glorious 5 Year Plan"));
- assertTrue(output.contains("3:54"));
- assertFalse(output.contains("http://127.0.0.1:8000/openalbum?id=1d9e8ed6-3893-4d3b-aa7d-6cd79609e386"));
- assertFalse(output.contains("tlen good"));
- }
-
-
- public void testOutputAndTportAsHtml() throws Exception {
-
- EnumMap<RequestParameter, String> extraInfoMap = new EnumMap<RequestParameter, String>(RequestParameter.class);
- extraInfoMap.put(RequestParameter.TAGGER_PORT, "8000");
-
- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 1);
- ResultsWriter writer = new TrackHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res,extraInfoMap);
- pr.close();
-
- String output = sw.toString();
- //System.out.println("Html is" + output);
- assertTrue(output.contains("hits=1"));
- assertTrue(output.contains("offset=0"));
- assertTrue(output.contains("redirect=7ca7782b-a602-448b-b108-bb881a7be2d6"));
- assertTrue(output.contains("searchresultseven"));
- assertTrue(output.contains("Gravitational Lenz"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("Our Glorious 5 Year Plan"));
- assertTrue(output.contains("3:54"));
- assertTrue(output.contains("http://127.0.0.1:8000/openalbum?id=1d9e8ed6-3893-4d3b-aa7d-6cd79609e386"));
- assertFalse(output.contains("tlen good"));
- }
-
- public void testOutputAndTportDurGoodMatchAsHtml() throws Exception {
-
- EnumMap<RequestParameter, String> extraInfoMap = new EnumMap<RequestParameter, String>(RequestParameter.class);
- extraInfoMap.put(RequestParameter.TAGGER_PORT, "8000");
- extraInfoMap.put(RequestParameter.DURATION, "234000");
-
-
-
- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 1);
- ResultsWriter writer = new TrackHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res,extraInfoMap);
- pr.close();
-
- String output = sw.toString();
- //System.out.println("Html is" + output);
- assertTrue(output.contains("hits=1"));
- assertTrue(output.contains("offset=0"));
- assertTrue(output.contains("redirect=7ca7782b-a602-448b-b108-bb881a7be2d6"));
- assertTrue(output.contains("searchresultseven"));
- assertTrue(output.contains("Gravitational Lenz"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("Our Glorious 5 Year Plan"));
- assertTrue(output.contains("3:54"));
- assertTrue(output.contains("http://127.0.0.1:8000/openalbum?id=1d9e8ed6-3893-4d3b-aa7d-6cd79609e386"));
- assertTrue(output.contains("tlen good"));
- }
-
- public void testOutputAndTportDurOkMatchAsHtml() throws Exception {
-
- EnumMap<RequestParameter, String> extraInfoMap = new EnumMap<RequestParameter, String>(RequestParameter.class);
- extraInfoMap.put(RequestParameter.TAGGER_PORT, "8000");
- extraInfoMap.put(RequestParameter.DURATION, "240000");
-
-
-
- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 1);
- ResultsWriter writer = new TrackHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res,extraInfoMap);
- pr.close();
-
- String output = sw.toString();
- //System.out.println("Html is" + output);
- assertTrue(output.contains("hits=1"));
- assertTrue(output.contains("offset=0"));
- assertTrue(output.contains("redirect=7ca7782b-a602-448b-b108-bb881a7be2d6"));
- assertTrue(output.contains("searchresultseven"));
- assertTrue(output.contains("Gravitational Lenz"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("Our Glorious 5 Year Plan"));
- assertTrue(output.contains("3:54"));
- assertTrue(output.contains("http://127.0.0.1:8000/openalbum?id=1d9e8ed6-3893-4d3b-aa7d-6cd79609e386"));
- assertTrue(output.contains("tlen ok"));
- }
-
- public void testOutputAndTportDurPoorMatchAsHtml() throws Exception {
-
- EnumMap<RequestParameter, String> extraInfoMap = new EnumMap<RequestParameter, String>(RequestParameter.class);
- extraInfoMap.put(RequestParameter.TAGGER_PORT, "8000");
- extraInfoMap.put(RequestParameter.DURATION, "240");
-
-
-
- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 1);
- ResultsWriter writer = new TrackHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res,extraInfoMap);
- pr.close();
-
- String output = sw.toString();
- //System.out.println("Html is" + output);
- assertTrue(output.contains("hits=1"));
- assertTrue(output.contains("offset=0"));
- assertTrue(output.contains("redirect=7ca7782b-a602-448b-b108-bb881a7be2d6"));
- assertTrue(output.contains("searchresultseven"));
- assertTrue(output.contains("Gravitational Lenz"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("Our Glorious 5 Year Plan"));
- assertTrue(output.contains("3:54"));
- assertTrue(output.contains("http://127.0.0.1:8000/openalbum?id=1d9e8ed6-3893-4d3b-aa7d-6cd79609e386"));
- assertTrue(output.contains("tlen bad"));
- }
-
- public void testOutputOldStyleLinkAsHtml() throws Exception {
-
- EnumMap<RequestParameter, String> extraInfoMap = new EnumMap<RequestParameter, String>(RequestParameter.class);
- extraInfoMap.put(RequestParameter.OLD_STYLE_LINK, "1");
-
-
-
- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 1);
- ResultsWriter writer = new TrackHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res,extraInfoMap);
- pr.close();
-
- String output = sw.toString();
- //System.out.println("Html is" + output);
- assertTrue(output.contains("hits=1"));
- assertTrue(output.contains("offset=0"));
- assertTrue(output.contains("redirect=7ca7782b-a602-448b-b108-bb881a7be2d6"));
- assertTrue(output.contains("searchresultseven"));
- assertTrue(output.contains("Gravitational Lenz"));
- assertTrue(output.contains("Farming Incident"));
- assertTrue(output.contains("Our Glorious 5 Year Plan"));
- assertTrue(output.contains("3:54"));
- assertTrue(output.contains("<a href=\"tag:7ca7782b-a602-448b-b108-bb881a7be2d6:1d9e8ed6-3893-4d3b-aa7d-6cd79609e386\">"));
- }
}

_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits