[mb-commits] r13674 - in search_server/trunk/servlet/src: main/resources test/java/org/musicbrainz/search/servlet

Author: ijabz
Date: 2013-05-02 12:08:28 +0000 (Thu, 02 May 2013)
New Revision: 13674

Modified:
   search_server/trunk/servlet/src/main/resources/oxml.xml
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
Log:
SEARCH-273:Collpase Release_Event-List and rename Release-Event to release-events for newjson output

Modified: search_server/trunk/servlet/src/main/resources/oxml.xml
===================================================================
--- search_server/trunk/servlet/src/main/resources/oxml.xml	2013-05-02 11:26:08 UTC (rev 13673)
+++ search_server/trunk/servlet/src/main/resources/oxml.xml	2013-05-02 12:08:28 UTC (rev 13674)
@@ -141,6 +141,11 @@
                 <xml-element java-attribute="mediumList" xml-path="."/>
             </java-attributes>
         </java-type>
+        <java-type name="Release">
+            <java-attributes>
+                <xml-element java-attribute="releaseEventList" xml-path="."/>
+            </java-attributes>
+        </java-type>
         <java-type name="Recording">
             <java-attributes>
                 <xml-element java-attribute="isrcList" xml-path="."/>
@@ -314,5 +319,10 @@
                 <xml-element java-attribute="relation" name="relations"/>
             </java-attributes>
         </java-type>
+        <java-type name="ReleaseEventList">
+            <java-attributes>
+                <xml-element java-attribute="releaseEvent" name="release-events"/>
+            </java-attributes>
+        </java-type>
     </java-types>
 </xml-bindings>

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java	2013-05-02 11:26:08 UTC (rev 13673)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java	2013-05-02 12:08:28 UTC (rev 13674)
@@ -59,7 +59,6 @@
 
             doc.addField(RecordingIndexField.RELEASE_ID, "1d9e8ed6-3893-4d3b-aa7d-6cd79609e386");
             doc.addField(RecordingIndexField.RELEASE, "Our Glorious 5 Year Plan");
-            doc.addField(RecordingIndexField.COUNTRY, "UK");
 
 
 
@@ -81,7 +80,6 @@
 
             release.setId("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386");
             release.setTitle("Our Glorious 5 Year Plan");
-            release.setCountry("UK");
 
             doc.addField(RecordingIndexField.PUID, "1d9e8ed6-3893-4d3b-aa7d-72e79609e386");
             PuidList puidList = of.createPuidList();
@@ -144,9 +142,16 @@
             ml.setTrackCount(BigInteger.valueOf(10));
             doc.addField(RecordingIndexField.RELEASE_STATUS, "Official");
             doc.addField(RecordingIndexField.RELEASE_DATE, "1970-01-01");
+            doc.addField(RecordingIndexField.COUNTRY, "UK");
             release.setStatus("Official");
             release.setDate("1970-01-01");
-
+            release.setCountry("UK");
+            ReleaseEventList rel = of.createReleaseEventList();
+            ReleaseEvent     re  = of.createReleaseEvent();
+            re.setCountry("UK");
+            re.setDate("1970-01-01");
+            rel.getReleaseEvent().add(re);
+            release.setReleaseEventList(rel);
             doc.addField(RecordingIndexField.ISRC, "123456789");
             doc.addField(RecordingIndexField.ISRC, "abcdefghi");
             IsrcList isrcList = of.createIsrcList();
@@ -529,6 +534,7 @@
         assertTrue(output.contains("indie</name>"));
         assertTrue(output.contains("<track><number>A4</number><title>Gravitational Lens</title><length>233000</length><artist-credit><name-credit><artist id=\"2302e264-1cf0-4d1f-aca7-2a6f89e34b36\"><name>Pig Incident</name><sort-name>Incident, Pig</sort-name></artist></name-credit></artist-credit></track>"));
         assertTrue(output.contains("<puid-list><puid id=\"1d9e8ed6-3893-4d3b-aa7d-72e79609e386\"/></puid-list>"));
+        assertTrue(output.contains("<release-event><country>UK</country><date>1970-01-01</date></release-event></release-event-list>"));
     }
 
 
@@ -563,6 +569,7 @@
         assertTrue(output.contains("\"tag\":[{\"count\":101,\"name\":\"indie\"}"));
         assertTrue(output.contains("\"puid-list\":{\"puid\":[{\"id\":\"1d9e8ed6-3893-4d3b-aa7d-72e79609e386\"}]}"));
         assertTrue(output.contains("\"artist-credit\":{\"name-credit\":[{\"artist\":{\"id\":\"89ad4ac3-39f7-470e-963a-56509c546377\",\"name\":\"Various Artists\"}"));
+        assertTrue(output.contains("\"release-event-list\":{\"release-event\":[{\"country\":\"UK\",\"date\":\"1970-01-01\"}]}"));
     }
 
     @Test
@@ -597,7 +604,8 @@
         assertTrue(output.contains("\"length\":234000"));
         assertTrue(output.contains("\"position\":1"));
         assertTrue(output.contains("\"track-count\":10"));
-
+        assertTrue(output.contains("\"secondary-types\":[\"Compilation\"]}"));
+        assertTrue(output.contains("\"release-events\":[{\"country\":\"UK\",\"date\":\"1970-01-01\"}]"));
     }
 
     @Test

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java	2013-05-02 11:26:08 UTC (rev 13673)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java	2013-05-02 12:08:28 UTC (rev 13674)
@@ -805,7 +805,7 @@
         assertTrue(output.contains("\"asin\":\"B00004Y6O9\""));
         assertTrue(output.contains("\"track-count\":17"));
         assertTrue(output.contains("\"secondary-type-list\":{\"secondary-type\":[\"Live\",\"Compilation\"]}}"));
-
+        assertTrue(output.contains("\"release-event-list\":{\"release-event\":[{\"country\":\"GB\",\"date\":\"2005\"}]}"));
     }
 
     @Test
@@ -838,7 +838,8 @@
         assertTrue(output.contains("\"label-info\""));
         assertTrue(output.contains("\"catalog-number\":\"WRATHCD-25\""));
         assertTrue(output.contains("\"primary-type\":\"Album\""));
-        assertTrue(output.contains(""));
+        assertTrue(output.contains("\"release-events\":[{\"country\":\"GB\",\"date\":\"2005\"}]"));
+        assertTrue(output.contains("\"secondary-types\":[\"Live\",\"Compilation\"]}"));
     }
 
     @Test